Some restructuring of scripts and settings