- Repository Refactor (Core Blocks)