Moved class into class package