Rearrange dependencies for imagebrowser