move files around a bit to get things using the new roles layout