Unified structure from Bezel2/dev

Woop