Updated controllers using Spring, added services