Moved class to the appropriate package