Added dj and djr aliases and minor reorg.