Fix circular dependency #101

Job	Run time
build-and-test (macos-latest)	1m 17s
build-and-test (windows-latest)	3m 5s
build-and-test (ubuntu-latest)	1m 14s
commit-generated-files	0s
	5m 36s

Provide feedback