Refactoring of Data class
General tidy up of all C++ files and removal of unecessary ones