Revert back to old folder structure. Broke Pathogen