Remapped all the namespaces to the camelCase convention and made it a bit shallower.