Fix symlinks, add sorting, big tidies