move things around to be a more typical django layout