Restructuring and moved to spring 4
Merge remote-tracking branch 'origin/master'