Restructured i3 config