Reorganized some of the classes and/or packages. Code refactoring and beautify. Javadoc adjutments.