Restructure checks and download like pyiricdata