Refactor
Cleanup
Rename exception
POM update. Rename groupId and add GQL dep
Merge remote-tracking branch 'origin/master'