Updated Project-Setup