reorg spring and web configs and objects
cleanup