Major overhaul in C++ and C# folders