Client side refactoring to support .cs files