Add basic scenario rewriters
Adjust namespaces