Moved scripts to folders and added a script