Updated solution, rmeoved old project