Rearrages directory structure