diff --git a/src/dotnet/dotnet/Common.cs b/src/dotnet/Common.cs
similarity index 100%
rename from src/dotnet/dotnet/Common.cs
rename to src/dotnet/Common.cs
diff --git a/src/dotnet/dotnet/FreeSwitch.NET.csproj b/src/dotnet/FreeSwitch.NET.csproj
similarity index 100%
rename from src/dotnet/dotnet/FreeSwitch.NET.csproj
rename to src/dotnet/FreeSwitch.NET.csproj
diff --git a/src/dotnet/dotnet/Makefile b/src/dotnet/Makefile
similarity index 100%
rename from src/dotnet/dotnet/Makefile
rename to src/dotnet/Makefile
diff --git a/src/dotnet/dotnet/Marshaling/BufferMarshaler.cs b/src/dotnet/Marshaling/BufferMarshaler.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/BufferMarshaler.cs
rename to src/dotnet/Marshaling/BufferMarshaler.cs
diff --git a/src/dotnet/dotnet/Marshaling/CallerExtensionMarshaler.cs b/src/dotnet/Marshaling/CallerExtensionMarshaler.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/CallerExtensionMarshaler.cs
rename to src/dotnet/Marshaling/CallerExtensionMarshaler.cs
diff --git a/src/dotnet/dotnet/Marshaling/CallerProfileMarshaler.cs b/src/dotnet/Marshaling/CallerProfileMarshaler.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/CallerProfileMarshaler.cs
rename to src/dotnet/Marshaling/CallerProfileMarshaler.cs
diff --git a/src/dotnet/dotnet/Marshaling/ChannelMarshaler.cs b/src/dotnet/Marshaling/ChannelMarshaler.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/ChannelMarshaler.cs
rename to src/dotnet/Marshaling/ChannelMarshaler.cs
diff --git a/src/dotnet/dotnet/Marshaling/ChannelTimetableMarshaler.cs b/src/dotnet/Marshaling/ChannelTimetableMarshaler.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/ChannelTimetableMarshaler.cs
rename to src/dotnet/Marshaling/ChannelTimetableMarshaler.cs
diff --git a/src/dotnet/dotnet/Marshaling/CoreSessionMarshaler.cs b/src/dotnet/Marshaling/CoreSessionMarshaler.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/CoreSessionMarshaler.cs
rename to src/dotnet/Marshaling/CoreSessionMarshaler.cs
diff --git a/src/dotnet/dotnet/Marshaling/EventMarshaler.cs b/src/dotnet/Marshaling/EventMarshaler.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/EventMarshaler.cs
rename to src/dotnet/Marshaling/EventMarshaler.cs
diff --git a/src/dotnet/dotnet/Marshaling/FileHandleMarshaler.cs b/src/dotnet/Marshaling/FileHandleMarshaler.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/FileHandleMarshaler.cs
rename to src/dotnet/Marshaling/FileHandleMarshaler.cs
diff --git a/src/dotnet/dotnet/Marshaling/MemoryPoolMarshaler.cs b/src/dotnet/Marshaling/MemoryPoolMarshaler.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/MemoryPoolMarshaler.cs
rename to src/dotnet/Marshaling/MemoryPoolMarshaler.cs
diff --git a/src/dotnet/dotnet/Marshaling/StreamHandleMarshaler.cs b/src/dotnet/Marshaling/StreamHandleMarshaler.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/StreamHandleMarshaler.cs
rename to src/dotnet/Marshaling/StreamHandleMarshaler.cs
diff --git a/src/dotnet/dotnet/Marshaling/Types/ApiInterfaceMarshal.cs b/src/dotnet/Marshaling/Types/ApiInterfaceMarshal.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/Types/ApiInterfaceMarshal.cs
rename to src/dotnet/Marshaling/Types/ApiInterfaceMarshal.cs
diff --git a/src/dotnet/dotnet/Marshaling/Types/ApplicationInterfaceMarshal.cs b/src/dotnet/Marshaling/Types/ApplicationInterfaceMarshal.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/Types/ApplicationInterfaceMarshal.cs
rename to src/dotnet/Marshaling/Types/ApplicationInterfaceMarshal.cs
diff --git a/src/dotnet/dotnet/Marshaling/Types/BufferMarshal.cs b/src/dotnet/Marshaling/Types/BufferMarshal.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/Types/BufferMarshal.cs
rename to src/dotnet/Marshaling/Types/BufferMarshal.cs
diff --git a/src/dotnet/dotnet/Marshaling/Types/CallerExtensionMarshal.cs b/src/dotnet/Marshaling/Types/CallerExtensionMarshal.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/Types/CallerExtensionMarshal.cs
rename to src/dotnet/Marshaling/Types/CallerExtensionMarshal.cs
diff --git a/src/dotnet/dotnet/Marshaling/Types/CallerProfileMarshal.cs b/src/dotnet/Marshaling/Types/CallerProfileMarshal.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/Types/CallerProfileMarshal.cs
rename to src/dotnet/Marshaling/Types/CallerProfileMarshal.cs
diff --git a/src/dotnet/dotnet/Marshaling/Types/ChannelFlagMarshal.cs b/src/dotnet/Marshaling/Types/ChannelFlagMarshal.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/Types/ChannelFlagMarshal.cs
rename to src/dotnet/Marshaling/Types/ChannelFlagMarshal.cs
diff --git a/src/dotnet/dotnet/Marshaling/Types/ChannelMarshal.cs b/src/dotnet/Marshaling/Types/ChannelMarshal.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/Types/ChannelMarshal.cs
rename to src/dotnet/Marshaling/Types/ChannelMarshal.cs
diff --git a/src/dotnet/dotnet/Marshaling/Types/ChannelStateMarshal.cs b/src/dotnet/Marshaling/Types/ChannelStateMarshal.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/Types/ChannelStateMarshal.cs
rename to src/dotnet/Marshaling/Types/ChannelStateMarshal.cs
diff --git a/src/dotnet/dotnet/Marshaling/Types/ChannelTimetableMarshal.cs b/src/dotnet/Marshaling/Types/ChannelTimetableMarshal.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/Types/ChannelTimetableMarshal.cs
rename to src/dotnet/Marshaling/Types/ChannelTimetableMarshal.cs
diff --git a/src/dotnet/dotnet/Marshaling/Types/CodecImplementationMarshal.cs b/src/dotnet/Marshaling/Types/CodecImplementationMarshal.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/Types/CodecImplementationMarshal.cs
rename to src/dotnet/Marshaling/Types/CodecImplementationMarshal.cs
diff --git a/src/dotnet/dotnet/Marshaling/Types/CodecInterfaceMarshal.cs b/src/dotnet/Marshaling/Types/CodecInterfaceMarshal.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/Types/CodecInterfaceMarshal.cs
rename to src/dotnet/Marshaling/Types/CodecInterfaceMarshal.cs
diff --git a/src/dotnet/dotnet/Marshaling/Types/CodecMarshal.cs b/src/dotnet/Marshaling/Types/CodecMarshal.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/Types/CodecMarshal.cs
rename to src/dotnet/Marshaling/Types/CodecMarshal.cs
diff --git a/src/dotnet/dotnet/Marshaling/Types/CodecTypeMarshal.cs b/src/dotnet/Marshaling/Types/CodecTypeMarshal.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/Types/CodecTypeMarshal.cs
rename to src/dotnet/Marshaling/Types/CodecTypeMarshal.cs
diff --git a/src/dotnet/dotnet/Marshaling/Types/CoreSessionMarshal.cs b/src/dotnet/Marshaling/Types/CoreSessionMarshal.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/Types/CoreSessionMarshal.cs
rename to src/dotnet/Marshaling/Types/CoreSessionMarshal.cs
diff --git a/src/dotnet/dotnet/Marshaling/Types/EventMarshal.cs b/src/dotnet/Marshaling/Types/EventMarshal.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/Types/EventMarshal.cs
rename to src/dotnet/Marshaling/Types/EventMarshal.cs
diff --git a/src/dotnet/dotnet/Marshaling/Types/FileHandleMarshal.cs b/src/dotnet/Marshaling/Types/FileHandleMarshal.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/Types/FileHandleMarshal.cs
rename to src/dotnet/Marshaling/Types/FileHandleMarshal.cs
diff --git a/src/dotnet/dotnet/Marshaling/Types/FrameMarshal.cs b/src/dotnet/Marshaling/Types/FrameMarshal.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/Types/FrameMarshal.cs
rename to src/dotnet/Marshaling/Types/FrameMarshal.cs
diff --git a/src/dotnet/dotnet/Marshaling/Types/IOEventHooksMarshal.cs b/src/dotnet/Marshaling/Types/IOEventHooksMarshal.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/Types/IOEventHooksMarshal.cs
rename to src/dotnet/Marshaling/Types/IOEventHooksMarshal.cs
diff --git a/src/dotnet/dotnet/Marshaling/Types/LoadableModuleInterfaceMarshal.cs b/src/dotnet/Marshaling/Types/LoadableModuleInterfaceMarshal.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/Types/LoadableModuleInterfaceMarshal.cs
rename to src/dotnet/Marshaling/Types/LoadableModuleInterfaceMarshal.cs
diff --git a/src/dotnet/dotnet/Marshaling/Types/LoadableModuleMarshal.cs b/src/dotnet/Marshaling/Types/LoadableModuleMarshal.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/Types/LoadableModuleMarshal.cs
rename to src/dotnet/Marshaling/Types/LoadableModuleMarshal.cs
diff --git a/src/dotnet/dotnet/Marshaling/Types/StreamHandleMarshal.cs b/src/dotnet/Marshaling/Types/StreamHandleMarshal.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/Types/StreamHandleMarshal.cs
rename to src/dotnet/Marshaling/Types/StreamHandleMarshal.cs
diff --git a/src/dotnet/dotnet/Marshaling/Types/TypesMarshal.cs b/src/dotnet/Marshaling/Types/TypesMarshal.cs
similarity index 100%
rename from src/dotnet/dotnet/Marshaling/Types/TypesMarshal.cs
rename to src/dotnet/Marshaling/Types/TypesMarshal.cs
diff --git a/src/dotnet/dotnet/Module.cs b/src/dotnet/Module.cs
similarity index 100%
rename from src/dotnet/dotnet/Module.cs
rename to src/dotnet/Module.cs
diff --git a/src/dotnet/dotnet/Modules/Api.cs b/src/dotnet/Modules/Api.cs
similarity index 100%
rename from src/dotnet/dotnet/Modules/Api.cs
rename to src/dotnet/Modules/Api.cs
diff --git a/src/dotnet/dotnet/Modules/Application.cs b/src/dotnet/Modules/Application.cs
similarity index 100%
rename from src/dotnet/dotnet/Modules/Application.cs
rename to src/dotnet/Modules/Application.cs
diff --git a/src/dotnet/dotnet/Properties/AssemblyInfo.cs b/src/dotnet/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/dotnet/dotnet/Properties/AssemblyInfo.cs
rename to src/dotnet/Properties/AssemblyInfo.cs
diff --git a/src/dotnet/dotnet/Switch/CallerProfile.cs b/src/dotnet/Switch/CallerProfile.cs
similarity index 100%
rename from src/dotnet/dotnet/Switch/CallerProfile.cs
rename to src/dotnet/Switch/CallerProfile.cs
diff --git a/src/dotnet/dotnet/Switch/Channel.cs b/src/dotnet/Switch/Channel.cs
similarity index 100%
rename from src/dotnet/dotnet/Switch/Channel.cs
rename to src/dotnet/Switch/Channel.cs
diff --git a/src/dotnet/dotnet/Switch/Console.cs b/src/dotnet/Switch/Console.cs
similarity index 100%
rename from src/dotnet/dotnet/Switch/Console.cs
rename to src/dotnet/Switch/Console.cs
diff --git a/src/dotnet/dotnet/Switch/CoreSession.cs b/src/dotnet/Switch/CoreSession.cs
similarity index 100%
rename from src/dotnet/dotnet/Switch/CoreSession.cs
rename to src/dotnet/Switch/CoreSession.cs
diff --git a/src/dotnet/dotnet/Switch/Ivr.cs b/src/dotnet/Switch/Ivr.cs
similarity index 100%
rename from src/dotnet/dotnet/Switch/Ivr.cs
rename to src/dotnet/Switch/Ivr.cs
diff --git a/src/dotnet/dotnet/Switch/LoadableModule.cs b/src/dotnet/Switch/LoadableModule.cs
similarity index 100%
rename from src/dotnet/dotnet/Switch/LoadableModule.cs
rename to src/dotnet/Switch/LoadableModule.cs
diff --git a/src/dotnet/dotnet/Switch/StreamHandle.cs b/src/dotnet/Switch/StreamHandle.cs
similarity index 100%
rename from src/dotnet/dotnet/Switch/StreamHandle.cs
rename to src/dotnet/Switch/StreamHandle.cs
diff --git a/src/dotnet/dotnet/Types/ApiFunction.cs b/src/dotnet/Types/ApiFunction.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/ApiFunction.cs
rename to src/dotnet/Types/ApiFunction.cs
diff --git a/src/dotnet/dotnet/Types/ApplicationFunction.cs b/src/dotnet/Types/ApplicationFunction.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/ApplicationFunction.cs
rename to src/dotnet/Types/ApplicationFunction.cs
diff --git a/src/dotnet/dotnet/Types/ApplicationInterface.cs b/src/dotnet/Types/ApplicationInterface.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/ApplicationInterface.cs
rename to src/dotnet/Types/ApplicationInterface.cs
diff --git a/src/dotnet/dotnet/Types/Buffer.cs b/src/dotnet/Types/Buffer.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/Buffer.cs
rename to src/dotnet/Types/Buffer.cs
diff --git a/src/dotnet/dotnet/Types/CallCause.cs b/src/dotnet/Types/CallCause.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/CallCause.cs
rename to src/dotnet/Types/CallCause.cs
diff --git a/src/dotnet/dotnet/Types/CallerExtension.cs b/src/dotnet/Types/CallerExtension.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/CallerExtension.cs
rename to src/dotnet/Types/CallerExtension.cs
diff --git a/src/dotnet/dotnet/Types/CallerProfile.cs b/src/dotnet/Types/CallerProfile.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/CallerProfile.cs
rename to src/dotnet/Types/CallerProfile.cs
diff --git a/src/dotnet/dotnet/Types/Channel.cs b/src/dotnet/Types/Channel.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/Channel.cs
rename to src/dotnet/Types/Channel.cs
diff --git a/src/dotnet/dotnet/Types/ChannelFlag.cs b/src/dotnet/Types/ChannelFlag.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/ChannelFlag.cs
rename to src/dotnet/Types/ChannelFlag.cs
diff --git a/src/dotnet/dotnet/Types/ChannelState.cs b/src/dotnet/Types/ChannelState.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/ChannelState.cs
rename to src/dotnet/Types/ChannelState.cs
diff --git a/src/dotnet/dotnet/Types/ChannelTimetable.cs b/src/dotnet/Types/ChannelTimetable.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/ChannelTimetable.cs
rename to src/dotnet/Types/ChannelTimetable.cs
diff --git a/src/dotnet/dotnet/Types/CoreSession.cs b/src/dotnet/Types/CoreSession.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/CoreSession.cs
rename to src/dotnet/Types/CoreSession.cs
diff --git a/src/dotnet/dotnet/Types/DtmfCallbackFunction.cs b/src/dotnet/Types/DtmfCallbackFunction.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/DtmfCallbackFunction.cs
rename to src/dotnet/Types/DtmfCallbackFunction.cs
diff --git a/src/dotnet/dotnet/Types/Event.cs b/src/dotnet/Types/Event.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/Event.cs
rename to src/dotnet/Types/Event.cs
diff --git a/src/dotnet/dotnet/Types/FileHandle.cs b/src/dotnet/Types/FileHandle.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/FileHandle.cs
rename to src/dotnet/Types/FileHandle.cs
diff --git a/src/dotnet/dotnet/Types/InputCallbackFunction.cs b/src/dotnet/Types/InputCallbackFunction.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/InputCallbackFunction.cs
rename to src/dotnet/Types/InputCallbackFunction.cs
diff --git a/src/dotnet/dotnet/Types/InputType.cs b/src/dotnet/Types/InputType.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/InputType.cs
rename to src/dotnet/Types/InputType.cs
diff --git a/src/dotnet/dotnet/Types/LoadableModule.cs b/src/dotnet/Types/LoadableModule.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/LoadableModule.cs
rename to src/dotnet/Types/LoadableModule.cs
diff --git a/src/dotnet/dotnet/Types/LoadableModuleInterface.cs b/src/dotnet/Types/LoadableModuleInterface.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/LoadableModuleInterface.cs
rename to src/dotnet/Types/LoadableModuleInterface.cs
diff --git a/src/dotnet/dotnet/Types/MemoryPool.cs b/src/dotnet/Types/MemoryPool.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/MemoryPool.cs
rename to src/dotnet/Types/MemoryPool.cs
diff --git a/src/dotnet/dotnet/Types/Module.cs b/src/dotnet/Types/Module.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/Module.cs
rename to src/dotnet/Types/Module.cs
diff --git a/src/dotnet/dotnet/Types/ModuleInterfaces.cs b/src/dotnet/Types/ModuleInterfaces.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/ModuleInterfaces.cs
rename to src/dotnet/Types/ModuleInterfaces.cs
diff --git a/src/dotnet/dotnet/Types/Status.cs b/src/dotnet/Types/Status.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/Status.cs
rename to src/dotnet/Types/Status.cs
diff --git a/src/dotnet/dotnet/Types/StreamHandle.cs b/src/dotnet/Types/StreamHandle.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/StreamHandle.cs
rename to src/dotnet/Types/StreamHandle.cs
diff --git a/src/dotnet/dotnet/Types/TextChannel.cs b/src/dotnet/Types/TextChannel.cs
similarity index 100%
rename from src/dotnet/dotnet/Types/TextChannel.cs
rename to src/dotnet/Types/TextChannel.cs
diff --git a/src/dotnet/dotnet/public.snk b/src/dotnet/public.snk
similarity index 100%
rename from src/dotnet/dotnet/public.snk
rename to src/dotnet/public.snk