HP Looks to Get its Software House in Order