The ATLAS experiment is commissioning a new software for the track and event reconstruction which will allow to use common code for the off-line and high-level trigger reconstruction, as well as for different detector set-ups. The new software defines a common event data model for all (tracking) detectors together with an algorithmic structure consisting of small, independent modules which communicate by common interfaces. The Inner Detector has just completed the new track reconstruction within this frame and has successfully applied it to simulated LHC events as well as trigger regions, combined test beam data and first cosmic ray events. Another important step towards preparing and maintaining an efficient reconstruction of LHC data is the closer integration of detector calibration and alignment as well as the reconstruction of high-level physics objects into the Inner Detector Software. Many activities have started in this field, and also the Muon Spectrometer Tracking software now undergoes a similar restructuring.