Refactored to new package structure.
Merge branch 'feat-refactor-ns' into develop