Attempting to change the file structure. Hope I don't fuck it up.