Added three classes and two packages .
 In addition some refactoring .