moved things around to match django 1.5.6 dir struct