Refactor to prepare for NuGet v0.2.0 release