Remove unused makefiles
Organize and clean