Renamed a few classes and added javadocs to the services.