Moved relocated class to proper package