Classes moved between packages for compat with afrl