new namespaces according to directory structure,
some cleanup
Merge branch 'updating-saltr-sdk'