BaseTools: cleanup class heirarchy