Revised nuget packages and project structure