Changes to make the c-sharp projects more manageable