And fix the small `jq` breakage.
Consolidating all modules under the same path, to clear out the top-level directory.
