Cleaning up solution files and upgrading to latest format