standardized Makefiles, removed some object files