remove non-tosqa files and adjust the rest