Change to the new namespace

Fixes #91

I'm going to do some Javadoc while I'm at it

Signed-off-by: Cruz Julian Bishop <cruz@techern.com>
Reverse a misguided change

Signed-off-by: Cruz Julian Bishop <cruz@techern.com>
Merge pull request #99 from Techern/namespace

Change to the new namespace