Folder layout tweak