Sourcing the functions was causing a hang.
The refactoring put the files in new places, add those to tracking.