Fix file namespace and refactor code
Merge branch 'release/0.3.0'