Move mechanism conversion to main. Close #23