IMPROVE: Move GemBox to more logical source location