Move partition variables on top.
Fix if's.
Fix packages.