Simplify machine names and tree - Fixes #57

All machines have been tested and work.