Spring 3.2 upgrade and reorganization
Implemented basic plugin capability