Updated to match Phoebe's

reorganized folders