Refactoring
Loading gz-models
Cleanup
Deleted unused code
Moved unused code