Corrected namespaces and updated csproj file