FIX: more convenient internal structure of fwlib