Also, maybe you could move windows specific methods from OSAdministration into the new OSAdministrationWinodws()