Now the app is back with no deprecation warning,
and layout files back where they belongs