WIP: More work on cleaning up bootstrap and creation.

This includes conversion to bolt style modules.