Refactoring things again...

Removed generic runeBlock from registry
Refactored packages