Spare code cosmetics
[Dev-Host] Folder support (partially)