Move away from spring

merge with master