Restructure queue runner