Refactoring to enable additional sources #892

All 151 tests pass in 0s

151 tests ±0 151 ✔️ ±0 0s ⏱️ -1s
    4 suites ±0     0 💤 ±0
    4 files ±0     0 ❌ ±0

Results for commit 3d181cc. ± Comparison against earlier commit 3a1e493.