Restructure vectors