Subfolders in define name and BugFix