Reorganizing things.
Updating README to support reorganization.