Corrected makefile and moved some scripts