Moving code around and getting the nuget packaging to work.