Added 'final' after public in java classes. Added toString methods, equals and hashcodes.
Removed XHTML files not needed anymore.