More scripts for building and watching
Small refactor