Modularized ds.py into separate libraries.
Cleaned up todo.