Modify module arrangement such that django vs shim decision happens in a single module.
Added tag 0.6 for changeset efbeefddaef9