Map files reorganized
Views names