Refactored classes. Corrected namespaces. Updated class diagram.