shuffling around, separating of Groovy.
Not used anymore.
Rename.
More Groovy separation.
Some simplifications to routing.
Flatten the module hierarchy.