More rational organization for modules

It makes it easier to import 'adama' as an app anywhere.