organized files

Moved files into one directory and made minor edits to scripts