Some refactoring

Pushing some of the modules we're using in cloner to updated gramework format

Still some more to push. Will do as we actually use them in the game.