Reorganize wrapper script