Reorganize to group vector manipulation functions together