Minor package+class name refactoring, adding some javadoc, autoformatting