Some Reorganization and renaming in CSharp Folders