Delete useless duplicate layouts folder and file correction
Revert "Delete useless duplicate layouts folder and file correction"

This reverts commit ba27dff56898c3ea62960687e1cc58574629b558.
Main layout reverse