Move BufferQueue to tools