[Task]: Create Infrastructure Classes

[simonkurtz-MSFT]

Describe the task

We presently have three infrastructures with some redundancy between them. What we should switch to is a base Infrastructure class, then inherit it in three separate infrastructure classes. Apply good OOP to this.

Change it, test it, ship it.