Model folders removed.
Folder structure was flatten