Changes in OOD and added some classes to project.