This commit reverts the module list generation code to what it was before the change to `include!` it and generates better output.
This commit reverts the module list generation code to what it was before the change to `include!` it and generates better output.