Refactoring of database folder structure