Regenerate and refactor package structure of Gratex services