Refactor namespaces
Fixed tests
Fixed readme