Upated dir structure for Client.Main project.