Added class diagram
Refactoring + multiple test examples
Layout arrangements