Undo some of the complexity of folder layout.