Bulk of sources tidy-ups was done for nuget-compatability with legacy code