Simplify directory structure