Rename to setup new structure

Refactoring to start pushing functionality to a separate business
object, at least to start.