Change bundle structure to 'new' services structure.