Added some structure
Fixed namespace tests