Refactoreds scripts under scripts-folder