Changed the way machines are represented. Made module Model.