renamed namespaces
modified names and paths
Merge branch 'dev-rename-module'