Moving everything to spring