Vector package restructuring
See last