visualisation tweaks and todo
test consolidation
applying some coding conventions i.e. moving classes to individual files, packages. spring cleaning.