Moved folders around so that a main menu made more sense in the flow