Chores & refactoring.

Some fix and refactoring of java namespaces. Now the comments follow AngularJs'.