Continue refactoring folder structure.