Reorganize scripts