Reorganized scripts into current and old/deprecated