[BUGFIX] Subfolders must use the identifier as identifier