Move to top level machines module, seems cleaner this way