Agree, but I don't have enough experience yet with modules (I find them confusing). Maybe for later, PRs are welcome :)