REFACTORING (RESTRUCTURE REPOSITORY)