[48] Put modules into their own packages