content/faq/bookmarks-01-edit/index.md

@@ -11,8 +11,8 @@ extra:
 
 To edit a bookmark use longtap menu or hit "Edit bookmark" when bookmark is selected on map.
 
-<img src="/images/faq/faq-bookmarks-android-selected.jpg" width="400px"/>
+<img src="/faq/bookmarks-01-edit/android-selected-bookmark.jpg" width="400"/>
 
 You can change bookmark name, description, color, and folder. Don't forget to tap "Save".
 
-<img src="/images/faq/faq-bookmarks-android-edit.jpg" width="400px"/>
+<img src="/faq/bookmarks-01-edit/android-edit-bookmark.jpg" width="400"/>

content/faq/bookmarks-03-import-android/index.md

@@ -9,6 +9,6 @@ extra:
   order: 30
 ---
 
-<img src="/images/faq/faq-bookmarks-android-import.jpg" width="400px"/>
+<img src="/faq/bookmarks-03-import-android/android-import-bookmarks.jpg" width="400px"/>
 
 Push "Import Bookmarks and tracks" button. Choose folder on your phone with KML/KMZ/GPX files. OrganicMaps will scan picked folder and import all bookmarks and tracks.

content/faq/bookmarks-04-import-gpx/index.md

@@ -11,8 +11,8 @@ extra:
 
 If you recieved GPX file in email, messenger, or cloud drive you can import it directly to OrganicMaps app.
 
-On iOS tap on GPX file and press Share button: <img src="/images/faq/faq-bookmarks-ios-share.png" width="50px"/>. Then select OrganicMaps to open the file.
+On iOS tap on GPX file and press Share button: <img src="/faq/bookmarks-04-import-gpx/ios-share.png" width="50px"/>. Then select OrganicMaps to open the file.
 
 On Android tap on recieved GPX file to see Share menu. Select OrganicMaps to import the file.
 
-<img src="/images/faq/faq-bookmarks-android-share-1.jpg" width="200px"/> <img src="/images/faq/faq-bookmarks-android-share-2.jpg" width="200px"/>
+<img src="/faq/bookmarks-04-import-gpx/android-share-1.jpg" width="200px"/> <img src="/faq/bookmarks-04-import-gpx/android-share-2.jpg" width="200px"/>

content/faq/map-02-legend/index.md

@@ -9,7 +9,7 @@ extra:
   order: 20
 ---
 
-<img src="/images/faq/faq-map-legend.jpg" width="400px"/>
+<img src="/faq/map-02-legend/legend.jpg" width="400px"/>
 
 Use long tap on any object to get it's type and name.
 You can find road type or forest kind in the bottom panel.

content/faq/map-05-one-hand-zoom/index.md

@@ -9,8 +9,8 @@ extra:
   order: 50
 ---
 
-<video width="300px" controls>
-  <source src="/images/faq/faq-map-one-finger-zoom-Mauritius.mp4" type="video/mp4"/>
+<video width="300px" controls="enabled">
+  <source src="/faq/map-05-one-hand-zoom/one-finger-zoom-Mauritius.mp4" type="video/mp4"/>
   (Your browser does not support the video tag.)
 </video>
 

content/faq/map-06-my-coordinates/index.md

@@ -9,7 +9,7 @@ extra:
   order: 60
 ---
 
-<img src="/images/faq/faq-map-my-position.jpg" width="400px"/>
+<img src="/faq/map-06-my-coordinates/my-position.jpg" width="400px"/>
 
 Tap on blue arrow indicating your position to see GPS coordinates, speed, and height above mean sea level.
 Push share button to give you coordinates to friends.

content/faq/map-07-circle/index.md

@@ -9,7 +9,7 @@ extra:
   order: 70
 ---
 
-<img src="/images/faq/faq-map-grey-circle.jpg" width="400px"/>
+<img src="/faq/map-07-circle/grey-circle.jpg" width="400px"/>
 
 GPS sensors have accuracy rate. Gray circle indicates this accuracy. Your actual position is somewhere inside this circle.
 Accuracy degrade inside buildings, near steal constructions or radiation sources.

content/faq/map-08-blue-arrow/index.md

@@ -9,7 +9,7 @@ extra:
   order: 80
 ---
 
-<img src="/images/faq/faq-map-blue-arrow.jpg" width="400px"/>
+<img src="/faq/map-08-blue-arrow/blue-arrow.jpg" width="400px"/>
 
 This arrow shows direction and distance from your location to selected POI. You should enable location to see it.
 Pressing this button gets fullscreen indicator of orientation and distance.

content/faq/map-09-location-button/index.md

@@ -11,8 +11,8 @@ extra:
 
 | Icon | Meaning |
 | ---- | ------- |
-| <img src="/images/faq/faq-map-location-icon-1.png" width="75px"/> | Location search is not initiated |
-| <img src="/images/faq/faq-map-location-icon-2.png" width="75px"/> | App is looking for location |
-| <img src="/images/faq/faq-map-location-icon-3.png" width="75px"/> | Current position is found. Map is centered on current position and oriented to North. |
-| <img src="/images/faq/faq-map-location-icon-4.png" width="75px"/> | Map is centered on current position and rotates according to device compas. |
+| <img src="/faq/map-09-location-button/location-icon-1.png" width="75px"/> | Location search is not initiated |
+| <img src="/faq/map-09-location-button/location-icon-2.png" width="75px"/> | App is looking for location |
+| <img src="/faq/map-09-location-button/location-icon-3.png" width="75px"/> | Current position is found. Map is centered on current position and oriented to North. |
+| <img src="/faq/map-09-location-button/location-icon-4.png" width="75px"/> | Map is centered on current position and rotates according to device compas. |
 

content/faq/map-12-latest/index.md

@@ -11,6 +11,6 @@ extra:
 
 First make sure you installed updated app from [AppStore][appstore], [Google Play][googleplay], [FDroid][fdroid], or [Huawei AppGallery][appgallery]. If maps data is outdated you will see red dot. Please download latest maps from menu.
 
-<img src="/images/faq/faq-map-data-updates.png" width="400px"/>
+<img src="/faq/map-12-latest/ios-data-updates.png" width="400px"/>
 
 {{ references() }}

content/faq/map-14-edits/index.md

@@ -9,6 +9,6 @@ extra:
   order: 140
 ---
 
-<img src="/images/faq/faq-map-edit-button.jpg" width="400px"/>
+<img src="/faq/map-14-edits/edit-button.jpg" width="400px"/>
 
 OrganicMaps works with map data from [OpenStreetMaps.org](https://osm.org) project. You can improve place details using "Edit Place" button. To make your changes publicly available you need an account on [OpenStreetMaps.org](https://osm.org). If you want to change POI position, or clarify footway, or add buildings and bridges, please use [OpenStreetMaps.org](https://osm.org) site with powerful editing tools.

content/faq/routing-01-build/index.md

@@ -13,7 +13,7 @@ OrganicMaps can build a route for car trip, bycicle ride or foot walk.
 
 Pick destination point with tap on a POI or by long tap on any place. Use "Route to" button to start route planning.
 
-<img src="/images/faq/faq-routing-button-route-to.jpg" width="400px"/>
+<img src="/faq/routing-01-build/route-to-button.jpg" width="400px"/>
 
 
 You can change route type from top menu:
@@ -23,6 +23,6 @@ You can change route type from top menu:
 * Bycicle
 * Ruller
 
-<img src="/images/faq/faq-routing-type.jpg" width="400px"/>
+<img src="/faq/routing-01-build/routing-types.jpg" width="400px"/>
 
 Push "Start" to begin step-by-step routing.

content/faq/routing-02-intermediate/index.md

@@ -11,8 +11,8 @@ extra:
 
 In route planning or routing mode pick a point on map and tap "Add Stop" button. New intermediate point would be added to the route.
 
-<img src="/images/faq/faq-routing-add-stop.jpg" width="400px"/>
+<img src="/faq/routing-02-intermediate/add-stop.jpg" width="400px"/>
 
 In routing mode you can search for gas stations, parking, food, stores and ATMs with search button
 
-<img src="/images/faq/faq-routing-search.jpg" width="75px"/>
+<img src="/faq/routing-02-intermediate/route-search.jpg" width="75px"/>

content/faq/routing-05-avoidance/index.md

@@ -11,10 +11,10 @@ extra:
 
 Go to Settings → Routing options and select types of road you want to avoid:
 
-<img src="/images/faq/faq-routing-avoid.jpg" width="400px"/>
+<img src="/faq/routing-05-avoidance/avoidance.jpg" width="400px"/>
 
 If you want to avoid unpaved roads pick selector near "Unpaved roads" as on screenshot.
 
 If OrganicMaps builds a route with some avoidable roads you will see button "Define roads to avoid" for quick setup.
 
-<img src="/images/faq/faq-routing-define-roads.jpg" width="400px"/>
+<img src="/faq/routing-05-avoidance/define-roads.jpg" width="400px"/>

content/faq/routing-07-ruler/index.md

@@ -11,10 +11,10 @@ extra:
 
 To measure distance from your current position to some object pick that object on map, tap "Route to" button, and select Ruler route type:
 
-<img src="/images/faq/faq-routing-ruller-type.jpg" width="400px"/>
+<img src="/faq/routing-07-ruler/ruler-type.jpg" width="400px"/>
 
 With ruler enabled tap anywhere on map to continue polyline.
 
-<img src="/images/faq/faq-routing-ruler-line.jpg" width="400px"/>
+<img src="/faq/routing-07-ruler/ruler-line.jpg" width="400px"/>
 
 You can choose any start point with "Route from" button.