moved stuff into module
big commit on simson machine