switching GtToken, etc to public classes