Added all files from Simondev unmodified