Refactor argument, fix organize script.