Compile 2.0 - Project structure improved