Move lock tooling to their own package