Restructure to support ansible role structure