change tsafe_queue folder structure