Switch to new django layout