Refactoring of folder structure