Putting files in correct folders

Also renaming items where applicable