Fixed Script errors, use one tools folder for now