Made some layout changes and added some new files and subprojects