Moved all the catch callbacks into their own work units which got their own set of files.  Also I made some minor refactors to the LevelScorer and some related code.