Improving the Efficiency of Hierarchical Structure-and-Motion