More cleaning up and renaming of files to try and make more sense