Create a contributor-friendly layout
Patch up namespaces