Refactored WrapperFactory to just Factory, updating classes to reflect this, migrating classes to use Factory instead of new.