better modularization, added some steps to make provisioning work with cashew