Store modules instead of namespaces on site
Docu
Fix mocks in tests