Moved the TimerMap into its own file, and did a little minor code cleanup.