Refactoring and jOOQ codegen
Consolidating schema definitions into single model
Merged with upstream
Cleanup
Cleanup