Reconstruction efforts took two years, as the shogunate took the opportunity to reorganize the city according to various practical considerations. Under the guidance of Rōjū Matsudaira Nobutsuna, streets were widened and some districts replanned and reorganized; special care was taken to restore Edo's mercantile center, thus protecting and boosting to some extent the overall national economy. Commoners and samurai retainers alike were granted funds from the government for the rebuilding of their homes, and the restoration of the shōgun's castle was left to be completed last. The area around the castle, as it was restored, was reorganized to leave greater spaces to act as firebreaks; retainers' homes were moved further from the castle, and a number of temples and shrines were relocated to the banks of the river.