Finishing renaming/reorganazing
Some classes links changes + UML diagram