Match module structure and directory structure
Qualify full class paths in Railtie
Merge branch 'module-organization'