restruct eifel

Signed-off-by: Weiping Pan <panweiping3@gmail.com>