Added two new source and two new class files