Removed excess files
 - fixed makefile to match directory layout