Remove unused custom matcher
Add from and to indices to Arrow and remove direction
Move the constants to the main file