Reorder inits and add undo-tree package