Better convention
Cleaning
Rewrote compatibility module with code based Django 1.6