Ref: refactored with 'on' function; moved aliases to correspounding sh-files