Updated Project, added rest and webapp