Directory layout changed to allow for easy Nuget packaging.
Fixed package directory structure for nuget