refactoring folder structure