Move aliases and add completion