refactoring of folder structure