separate installing directories form files, fix installing files, update #2634