Fix code structure #512

Job	Run time
Build and Verify	41m 58s
Run functional tests (1)	16m 48s
Run functional tests (2)	28m 48s
Run functional tests (3)	42m 35s
Run functional tests (4)	34m 1s
Run functional tests (5)	24m 22s
Run functional tests (6)	34m 45s
Run functional tests (7)	22m 43s
Run functional tests (8)	25m 6s
Run functional tests (9)	35m 44s
Run functional tests (10)	24m 30s
Run functional tests (11)	38m 7s
Run functional tests (12)	49m 33s
Run functional tests (13)	12m 42s
Build min release artifacts (Linux x64, tar.gz, linux-x64, build-platform --linux --skip-os-packa...	20m 38s
Build min release artifacts (Linux ARM64, tar.gz, linux-arm64, build-platform --linux-arm --skip-...	18m 14s
Run backwards compatibility tests (osd-1.3.2)	8m 24s
Run backwards compatibility tests (osd-2.0.0)	9m 24s
Run backwards compatibility tests (osd-2.1.0)	8m 13s
Run backwards compatibility tests (osd-2.2.0)	9m 3s
Run backwards compatibility tests (osd-2.3.0)	9m 4s
	8h 34m 42s

Provide feedback