reorganize and add options for bundle and migrate