Restructure download tables