Reorganized data objects. Improved README.md and docs.