Minor cleanup and just reorg #2238

Job	Run time
Build and test docker images	8m 53s
Build aarch64-apple-darwin	4m 21s
Lint and Unit test	4m 0s
Build debian-x86_64	5m 22s
Build x86_64-apple-darwin	13m 9s
Build x86_64-pc-windows-msvc	5m 34s
Build x86_64-unknown-linux-gnu	2m 11s
Test postgis:11-3.0-alpine sslmode=disable	6m 20s
Test on macOS-latest	7m 28s
Test postgis:14-3.3-alpine sslmode=disable	3m 37s
Test on windows-latest	2m 59s
Test postgis:15-3.3 sslmode=require	6m 22s
Test on ubuntu-latest	1m 4s
Package	57s
CI Finished	4s
	1h 12m 21s

Provide feedback