Moved our script files to new folder and updated

Also updated organization of the files - certain things were in the
wrong files logically.