Reorganized and cleaned up some scripts.