YouCompleteMe: merge back with ycmd, use upstream directory structure