+ start shaping up main.cpp + make the usage of namespaces and class names more consistent throughout the whole project + refactor related unit tests accordingly