Fixed buildfiles for new folder and project structure.