Added refractored solution with data and web projects and updated packages