Tidied up the core, removed namespaces, settled on a design.