cleaned up makefile and put some files/classes as libs