fixes in scripts, moved & renamed some content