Reorganize structure to make this more easily tested.
Update usage in README