Improved make clean.
Renamed temp to test, because that was wrong earlier.
Moved stuff to main_folder.