Reorder scripts for code readability