started restructuring everything for django-nonrel