Reverting "consolidate & simplify our sources"
Revert "consolidate & simplify our sources"

This reverts commit 30c22aa996971bf7f061a7c13752d56e9c371f6e.
bump