Reorganized aliases. Added apt aliases.