Updated class diagram;

Transferred classes to namespace that fits their field.