Added unit settings.
Merge branch 'master' of github.com:applyance/client
Restructured some.