es: Fix the hardware structure
Merge pull request #18 from ahcorde/master

es: Fix the hardware structure