Add missing dependencies; make sure all the bits pointing to right files
Pass origami build tools