Moved to makefiles, added some scripts, fixed tests, added overwrites