Restructure dashiki configurer

Change-Id: Ia4d4462babec94fc3a576b5d7e90fcbb16565634