Moved scripts to correct folders and did more cleanup