folder structure refactoring