Reorganized exception packages