Remove separate files for arc and arrow and add a type parameter to line.   We can then just update the type if we want to change line styles instead of creating new objects.