Tooling update to match new dir layout