Moved to Spring 4.0
Some changes in layout
Moving to java configuration was finished