Refactored many old Infrastructure classes into the new code.