module approach

just a little change to the layout of the stubs