Reorganised hardware directory structure