Added OO Design to the project
Merge