#150 Rewrite empty file/folder creation