significant tidying in preparation of basic hardware build