Slight tool restructure

- attempt to fix compiler issues again