Rely on the new built-in support which was added upstream as part of v0.10. Crucially, upstream supports using tree-sitter aware comment strings by default.
Consolidating all modules under the same path, to clear out the top-level directory.