rearrange code, rename nuspec