Move into seperate repository and nuget Package