Currently the components are spread amongst 1:1 modules. I'd like to see them all consolidated under a single module.