removed duplication of information ( again ;_; ) and also added changed some classes to Public.