Updated makefiles for new project structure