Device re-structurization (#48)

### Not ready yet!