Removed sub project and introduced nuget package