Restructure and add labeled axes