restructured makefile and renamed most files