Complete rearrangement of folder structure. Still need to update files to utilize the new structure