Updated name of the main classes and made it generic. Added two unit test to the project.