CW Gene and CW Protein hack to Gene-Protein linksets as well
Reordered modules to keep core modules first