heavy refactoring, new file structure, Django 1.5