[Fixes #78629594] re-org of directory structure, added more specs