Nuget & restructure