minor reorg
incorporate flexifields module