Move mappings to filetype directory
Merged with latest