Pulled affinity group out into it's own directory /model and imported into Rider. Renamed rider and also fixed a bug where there could be duplicate entries in the mapping table. Also added contraint that the group code can be a min of 3 and max of 7.