Moved class into right package