AW: Further modularization ideas