updated subprojects to work with new folder structure