Simplify directory layout.