reorder files, add arm version