HW module refactoring; images and files (in progress)