Reorganizes directory layout