Rename setup module to builder
More structure cleanup
* move more logic from the cli into its own module