Refactor arrows into own module