Refactor ansible roles