Refactored the solution

While going through the Windows Client Solution/projects, we thought grouping of projects will increases the readability and helps in better maintaining of projects.