Renamed the solution and made the code changes.

Code changes wrt Data project.