Reorganize; add ftdetect+syntax; make completion more reliable