This is using submodules instead of toplevel modules. Last time I tried to do this +samth commented that top level modules were better for tests, but that was around the introduction of submodules. Have things changed?