Minor refactoring/moving of branch, JavaDoc for REST plugin, etc.