Refactored repository package structure.