Moved listeners to combined listeners to other files, added class javadocs.