Moved scripts around

Not sure about some of the other ones, but I moved some scripts.  This
may cause dependency issues, so others may need to be moved.