Moved arrow into its own class.