moved some files / namespaces around
tidied up the test message file and type hierachy