simplify directory structure