Moved new classes to proper directory