Django 1.6 updates, project tree changes
Related tidying up.