Tidy files, move ftplugin files to after/ftplugin
Tidy files, move ftplugin files to after/ftplugin