Created a makefile and changed the project structure