SupportMapFragment in unified.xml
reformatting
Unused layout files were removed.
Layout files were renamed