fix everything for 1.8
I've messed up the original file structure so much... :S