Renaming to correct solution name and folders.