Moved class into package