FS-10167: Significant cleanup and isolation of code into manager types for better maintainability and easier path to future updates