Hewlett Packard Enterprise (HPE) CTO and head of HP Labs, Martin Fink, is retiring from the company, said HPE on Monday. Also leaving the company is HPE chief customer officer John Hinshaw. The company also announced a reorganization of divisions and key executives.

Our goal is to create a standalone company that is more efficient, agile and innovative right out of the gate

“After we complete the spin of our Enterprise Services business in March 2017, our goal is to create a standalone company that is more efficient, agile and innovative right out of the gate. To that end, we are implementing some organizational changes to make HPE even stronger and more successful,” said HPE CEO Meg Whitman in a statement.

HP Labs is now part of the Enterprise Group, and is headed by Antonio Neri, executive vice president and general manager of the Enterprise Group. This move, says the company, will help align the company’s R&D work on The Machine (The Machine is a HP project that is focused on building a new computer architecture based on memory-driven computing) with the business – particularly how key components like photonics and memristor are integrated into existing product lines.

HPE is aligning its sales teams into a single global sales organization, within the company’s Enterprise Group. The organization will be led by Peter Ryan, currently senior vice president and managing director of the Enterprise Group’s EMEA region, and will also include regional and indirect sales.

Product Marketing, E-commerce, and Customer Advocacy groups are now merged into a single marketing organization under the leadership of Henry Gomez, HPE Chief Marketing and Communications Officer.

HPE IT and Cyber Security teams will now be headed by Chris Hsu, the company’s chief operating officer.

John Hinshaw, chief customer officer with HPE, will be leaving at the end of the year.