Javadoc added, and renaming of classes
Javadoc added and classes renamed