Converted to new namespaces and changed a few things around
Merge branch 'release/1.0.0'