Small fixes and reorganization on VS Project File