Restructure queue modules