Namespaces should be consistent with the directory structure.

As per the PSR-0 standard.
Merge pull request #8 from nick-jones/fix.namespaces

Namespaces should be consistent with the directory structure