RTC buildsystemtoolkit creates a new directory with the same name as the component

Recently, I upgraded rtc buildsystem toolkit from v4.0.5 to 5.0.2. But now I observe the workspace load has components created as folders, but creates a new directory with the same name as the component as nested folder. With 4.0.5, this behaviour was not there. How can I get rid of this in 5.0.2.
For example in 4.0.5, the workspace is as -
Root
Component Folder 1
File 1
File 2
Component Folder 2
File 1
File 2
But now with 5.0.2, the workspace is as below -
Root
Component Folder 1
Component Folder 1
File 1
File 2
Component Folder 2
Component Folder 2
File 1
File 2
Accepted answer

The change in behavior could be because of the fix for
290773: Jazz PreBuildParticipant cannot use both includeRepositoryPath and the create component folder which was delivered in 406. See comment 9 in the workitem.
I would suggest to unselect create folders for components and run the build once with "Delete directory before loading" option selected. This should get past the overwrite errors. After that you can turn off the "Delete directory before loading" option.
But if you have multiple build machines where the nested component name structure is loaded you might have to retain selection of the "Delete directory before loading" option for sometime until the loaded contents are cleared across all of them.
Comments

Hi Sridevi, thanks a lot for your answer. Actually I just made and now it works as I needed. Thanks a lot for your help.
<sandboxRelativePath includeComponentName="false"

Yes, setting includeComponentName to false should also solve the duplicate folders issue. Glad that your issue is resolved!
One other answer

The nested folders could be created because create folders for components option is selected in the Jazz Source Control configuration and includeComponentName is also set to true in the load rules file.
Were the load rules configured before the upgrade? If so has there been any change after the upgrade? Also was the create folders for components always selected?
Comments

Yes, the load rules are there before upgrade. The only change I did is change the toolkit path from 4.0.5 to 5.0. Yes, createfolders for components is always selected. Infact I disabled this after upgrade but I get overwrite errors. Do you know if there is any change w.r.t load rules in 5.0.2 compared to 4.0.5. Please help here
Comments
Sridevi Sangaiah
JAZZ DEVELOPER Apr 01 '19, 3:20 a.m.hima makam
Apr 02 '19, 11:24 p.m.<scm:sourceControlLoadRule version="1" xmlns:scm="http://com.ibm.team.scm">
<parentLoadRule>
<component name="App_Enterprise_Admin"/>
<parentFolder repositoryPath="/"/>
<sandboxRelativePath includeComponentName="true" includeRepositoryPath="true"/>
</parentLoadRule>
<parentLoadRule>
<component name="App_Item_Configurator"/>
<parentFolder repositoryPath="/"/>
<sandboxRelativePath includeComponentName="true" includeRepositoryPath="true"/>
</parentLoadRule>
<parentLoadRule>
<component name="Application_Addin"/>
<parentFolder repositoryPath="/"/>
<sandboxRelativePath includeComponentName="true" includeRepositoryPath="true"/>
</parentLoadRule>
<parentLoadRule>
<component name="Build"/>
<parentFolder repositoryPath="/"/>
<sandboxRelativePath includeComponentName="true" includeRepositoryPath="true"/>
</parentLoadRule>