Clean up of main directory, getting Makefiles to work