massive changes to folder structure