Renamed layout files to a more concise and consistent naming convention