Changed the building order

All depending class files will be included now