Moved scripts to subfolders