heavy reworking and renaming. mainly gem tools.