directory structure refactor