Updated and Added

Updated and change classes to implement a better pattern of design for
the applicaiton.