Preserving the maven revision feature from the previous commit, but perform a bit more restructuring the hierarchy.