Modified scripts according to refactor of package.