Revert "Task #367644 Basic entities layouts have been added " -> wrong branch

This reverts commit c3e9a21116d5e1969123b57e30cc91a83ec626a5.