more re-organisation of scripts. rename folders...