Separate the modules into their own bundle