Optimized build, code organization