Updated Javadoc comments, cleaned up code, and package name

@CARammelkamp
~requested: 100