Initial work on migrating to a shared structure for the boilerplate code.