Merge "more mainline-related code to module-specific directories"