Updated to new class name
Moved relocated class to proper package