Big restructuring of vim config