Restructure process and upgrade to Django 1.6
Restructure process and upgrade to Django 1.6 (part 2)