Tidied up the source tree and finished removing namespaces.