Some cleanup and move files to more appropriate locations

 Includes some makefile changes