In my next pull request the module tables will disappear...