Merge branch 'dev'
Minor cleanup
Bring namespace and filepath into alignment