update and simplify directory structure