refactoring assist folder's structure