Refactor fuel-tables to a nice and clean package