Removed unused classes. Added 'uml' (kind-of,...) diagram