re-org of Stubs and some cleanup