Continued refactor of classes. Removing ugly comments, replacing with
JavaDoc. Currently compiles, no guarantee of functionality.