Consistent Structure of Subprojects

* restructured subprojects to enhance overview