Moved class to the content package