Added makefile and reorganised some files