Gwas class reorganization