Modified names
Added new class files