simplify directory structure

simplify directory structure