Declare everything in a custom namespace
Some refactoring (mostly involving Message)