Added new Maintenance base classes

* Also removed legacy Code

Change-Id: Ib49d6a6375204514eeac2b44517d157641ef8422
Merge "Added new Maintenance base classes"