Tidy files, move ftplugin files to after/ftplugin