reorganized django templates