Refactor added machine specific files and bin