Fixing some csproj issues and encapsulation.