PROPOSAL: Decouple Modules