Major reorganization.

This is the start of 0.6.0 work.