Removed the new enums from their last location
Implemented the APIWrapperFactory