- Moved modules to compile directly