Making sources modular