code clean up v1.0 | add Machine, Server classes