Restore can now remap base/tablespace locations.
Made Restore more modular.