Simplify directory layout