Reorganizes directory structure