Moved new classes to new package