Added updated and new class files