Refactor Gui components and matching model classes
added new version of cpp-server