Tools directory + supporting changes

:construction: :construction: :construction: :construction: 
---
Few minor things to wrap up here but getting close, feel free to read the commits or just sit tight. I'll provide a better PR description after cleaning up a few things here or there.