backport of 439eb8de8c56166e0196cb75c9570ba1cca4da6a commit

> remove script/ directory and move it's content to extra/