Restructuring for install vs. provision
Relocating roles dir