cleanup/restruct
cleanup/restruct cont'd
cleanup/rebuild
tuned for nuget package restore