Restructure to avoid name collisions.
Add docstring for unit test, minor fixes.
Update roadmap.