Massive directory restructuring as per MatthewSorensen