refactor directory structure,