Re-ordering install stuff