Move new class to proper folder
More clean up