Modified JavaDoc and refactored the code namespaces