Move some things to file-specific ftplugin folders; General cleanup