fixup! modules: add modules to "kits"

Change-Id: I873421dbb4fc1e09f1a17eb5d3ab36ea1106c125