Switch to modular packages