Changed packaging

Moved a class to a proper package