Fix multi-module packaging