Reorg & Spring setup
Reorg & basic Spring setup