Feature/refactor provisioning

The deed is done