Reorganize a bit
Reorganize a bit

immutant/immutant,kbaribeau/immutant,coopsource/immutant,kbaribeau/immutant,coopsource/immutant,immutant/immutant,immutant/immutant,immutant/immutant,coopsource/immutant,kbaribeau/immutant