Restructure Axis Tools connector.