reordered workflow and files.
merge