Moved StudyFactory and others into deprecated