remove outsourced roles
add roles as submodules back again