GTH commit, re-structure