Cleanup, NuGet pack

Code cleanup, Added some refactoring, packed as NuGet package
Merge pull request #1 from valdisiljuconoks/master

Cleanup, NuGet pack