make the already existing gendered restrooms simply 2 non-gendered restrooms. even when making new restrooms you should keep doing 2, because 2 is always better than 1.