Reorganize i3 config