Refactore file structure