Refactoring and redirection.
Remove excess.
Merge branch 'release-0.2.0'