Reorganized BDE modules