Merge pull request #555 from cnelissen/NamespaceNetPackage

Namespace net package

* cnelissen/NamespaceNetPackage:
  Temporary constant fix
  Updated unit tests
  Namespaced classes