Changing directory layout back to something more canonical