Made the makefile and some structuring