Split session and machine setups

Fixes #1