diff --git a/bruno-yaml/admin/Get Admin Library.yml b/bruno/admin/Get Admin Library.yml
similarity index 100%
rename from bruno-yaml/admin/Get Admin Library.yml
rename to bruno/admin/Get Admin Library.yml
diff --git a/bruno-yaml/admin/Get Admin Profile.yml b/bruno/admin/Get Admin Profile.yml
similarity index 100%
rename from bruno-yaml/admin/Get Admin Profile.yml
rename to bruno/admin/Get Admin Profile.yml
diff --git a/bruno-yaml/analytics/Get Device Usage.yml b/bruno/analytics/Get Device Usage.yml
similarity index 100%
rename from bruno-yaml/analytics/Get Device Usage.yml
rename to bruno/analytics/Get Device Usage.yml
diff --git a/bruno-yaml/analytics/Get Popular Books.yml b/bruno/analytics/Get Popular Books.yml
similarity index 100%
rename from bruno-yaml/analytics/Get Popular Books.yml
rename to bruno/analytics/Get Popular Books.yml
diff --git a/bruno-yaml/analytics/Get Reading Stats Date Range.yml b/bruno/analytics/Get Reading Stats Date Range.yml
similarity index 100%
rename from bruno-yaml/analytics/Get Reading Stats Date Range.yml
rename to bruno/analytics/Get Reading Stats Date Range.yml
diff --git a/bruno-yaml/analytics/Get Reading Stats.yml b/bruno/analytics/Get Reading Stats.yml
similarity index 100%
rename from bruno-yaml/analytics/Get Reading Stats.yml
rename to bruno/analytics/Get Reading Stats.yml
diff --git a/bruno-yaml/books/Bulk Delete Books.yml b/bruno/books/Bulk Delete Books.yml
similarity index 100%
rename from bruno-yaml/books/Bulk Delete Books.yml
rename to bruno/books/Bulk Delete Books.yml
diff --git a/bruno-yaml/books/Bulk Update Books.yml b/bruno/books/Bulk Update Books.yml
similarity index 100%
rename from bruno-yaml/books/Bulk Update Books.yml
rename to bruno/books/Bulk Update Books.yml
diff --git a/bruno-yaml/collections/Add Books to Collection.yml b/bruno/collections/Add Books to Collection.yml
similarity index 100%
rename from bruno-yaml/collections/Add Books to Collection.yml
rename to bruno/collections/Add Books to Collection.yml
diff --git a/bruno-yaml/collections/Create Collection.yml b/bruno/collections/Create Collection.yml
similarity index 100%
rename from bruno-yaml/collections/Create Collection.yml
rename to bruno/collections/Create Collection.yml
diff --git a/bruno-yaml/collections/Create Device Mapping.yml b/bruno/collections/Create Device Mapping.yml
similarity index 100%
rename from bruno-yaml/collections/Create Device Mapping.yml
rename to bruno/collections/Create Device Mapping.yml
diff --git a/bruno-yaml/collections/Delete Collection.yml b/bruno/collections/Delete Collection.yml
similarity index 100%
rename from bruno-yaml/collections/Delete Collection.yml
rename to bruno/collections/Delete Collection.yml
diff --git a/bruno-yaml/collections/Delete Device Mapping.yml b/bruno/collections/Delete Device Mapping.yml
similarity index 100%
rename from bruno-yaml/collections/Delete Device Mapping.yml
rename to bruno/collections/Delete Device Mapping.yml
diff --git a/bruno-yaml/collections/Get Book Collections.yml b/bruno/collections/Get Book Collections.yml
similarity index 100%
rename from bruno-yaml/collections/Get Book Collections.yml
rename to bruno/collections/Get Book Collections.yml
diff --git a/bruno-yaml/collections/Get Collection.yml b/bruno/collections/Get Collection.yml
similarity index 100%
rename from bruno-yaml/collections/Get Collection.yml
rename to bruno/collections/Get Collection.yml
diff --git a/bruno-yaml/collections/Get Collections.yml b/bruno/collections/Get Collections.yml
similarity index 100%
rename from bruno-yaml/collections/Get Collections.yml
rename to bruno/collections/Get Collections.yml
diff --git a/bruno-yaml/collections/Get Device Mappings.yml b/bruno/collections/Get Device Mappings.yml
similarity index 100%
rename from bruno-yaml/collections/Get Device Mappings.yml
rename to bruno/collections/Get Device Mappings.yml
diff --git a/bruno-yaml/collections/Remove Book from Collection.yml b/bruno/collections/Remove Book from Collection.yml
similarity index 100%
rename from bruno-yaml/collections/Remove Book from Collection.yml
rename to bruno/collections/Remove Book from Collection.yml
diff --git a/bruno-yaml/collections/Update Collection.yml b/bruno/collections/Update Collection.yml
similarity index 100%
rename from bruno-yaml/collections/Update Collection.yml
rename to bruno/collections/Update Collection.yml
diff --git a/bruno-yaml/collections/Update Device Mapping.yml b/bruno/collections/Update Device Mapping.yml
similarity index 100%
rename from bruno-yaml/collections/Update Device Mapping.yml
rename to bruno/collections/Update Device Mapping.yml
diff --git a/bruno-yaml/collections/scenarios/Bulk Add Books to Collections.yml b/bruno/collections/scenarios/Bulk Add Books to Collections.yml
similarity index 100%
rename from bruno-yaml/collections/scenarios/Bulk Add Books to Collections.yml
rename to bruno/collections/scenarios/Bulk Add Books to Collections.yml
diff --git a/bruno-yaml/collections/scenarios/Bulk Remove Books - All Books.yml b/bruno/collections/scenarios/Bulk Remove Books - All Books.yml
similarity index 100%
rename from bruno-yaml/collections/scenarios/Bulk Remove Books - All Books.yml
rename to bruno/collections/scenarios/Bulk Remove Books - All Books.yml
diff --git a/bruno-yaml/collections/scenarios/Bulk Remove Books - Empty List.yml b/bruno/collections/scenarios/Bulk Remove Books - Empty List.yml
similarity index 100%
rename from bruno-yaml/collections/scenarios/Bulk Remove Books - Empty List.yml
rename to bruno/collections/scenarios/Bulk Remove Books - Empty List.yml
diff --git a/bruno-yaml/collections/scenarios/Bulk Remove Books - Invalid IDs.yml b/bruno/collections/scenarios/Bulk Remove Books - Invalid IDs.yml
similarity index 100%
rename from bruno-yaml/collections/scenarios/Bulk Remove Books - Invalid IDs.yml
rename to bruno/collections/scenarios/Bulk Remove Books - Invalid IDs.yml
diff --git a/bruno-yaml/collections/scenarios/Bulk Remove Books - Single Book.yml b/bruno/collections/scenarios/Bulk Remove Books - Single Book.yml
similarity index 100%
rename from bruno-yaml/collections/scenarios/Bulk Remove Books - Single Book.yml
rename to bruno/collections/scenarios/Bulk Remove Books - Single Book.yml
diff --git a/bruno-yaml/collections/scenarios/Test Collection Rules - Author Contains.yml b/bruno/collections/scenarios/Test Collection Rules - Author Contains.yml
similarity index 100%
rename from bruno-yaml/collections/scenarios/Test Collection Rules - Author Contains.yml
rename to bruno/collections/scenarios/Test Collection Rules - Author Contains.yml
diff --git a/bruno-yaml/collections/scenarios/Test Collection Rules - Copyright Year Greater Than.yml b/bruno/collections/scenarios/Test Collection Rules - Copyright Year Greater Than.yml
similarity index 100%
rename from bruno-yaml/collections/scenarios/Test Collection Rules - Copyright Year Greater Than.yml
rename to bruno/collections/scenarios/Test Collection Rules - Copyright Year Greater Than.yml
diff --git a/bruno-yaml/collections/scenarios/Test Collection Rules - Empty Rules Array.yml b/bruno/collections/scenarios/Test Collection Rules - Empty Rules Array.yml
similarity index 100%
rename from bruno-yaml/collections/scenarios/Test Collection Rules - Empty Rules Array.yml
rename to bruno/collections/scenarios/Test Collection Rules - Empty Rules Array.yml
diff --git a/bruno-yaml/collections/scenarios/Test Collection Rules - No Matches.yml b/bruno/collections/scenarios/Test Collection Rules - No Matches.yml
similarity index 100%
rename from bruno-yaml/collections/scenarios/Test Collection Rules - No Matches.yml
rename to bruno/collections/scenarios/Test Collection Rules - No Matches.yml
diff --git a/bruno-yaml/collections/scenarios/Test Collection Rules.yml b/bruno/collections/scenarios/Test Collection Rules.yml
similarity index 100%
rename from bruno-yaml/collections/scenarios/Test Collection Rules.yml
rename to bruno/collections/scenarios/Test Collection Rules.yml
diff --git a/bruno-yaml/conflicts/Delete Conflict.yml b/bruno/conflicts/Delete Conflict.yml
similarity index 100%
rename from bruno-yaml/conflicts/Delete Conflict.yml
rename to bruno/conflicts/Delete Conflict.yml
diff --git a/bruno-yaml/conflicts/Dismiss All Resolved.yml b/bruno/conflicts/Dismiss All Resolved.yml
similarity index 100%
rename from bruno-yaml/conflicts/Dismiss All Resolved.yml
rename to bruno/conflicts/Dismiss All Resolved.yml
diff --git a/bruno-yaml/conflicts/Get Conflict Details.yml b/bruno/conflicts/Get Conflict Details.yml
similarity index 100%
rename from bruno-yaml/conflicts/Get Conflict Details.yml
rename to bruno/conflicts/Get Conflict Details.yml
diff --git a/bruno-yaml/conflicts/List Conflicts.yml b/bruno/conflicts/List Conflicts.yml
similarity index 100%
rename from bruno-yaml/conflicts/List Conflicts.yml
rename to bruno/conflicts/List Conflicts.yml
diff --git a/bruno-yaml/conflicts/Resolve Conflict.yml b/bruno/conflicts/Resolve Conflict.yml
similarity index 100%
rename from bruno-yaml/conflicts/Resolve Conflict.yml
rename to bruno/conflicts/Resolve Conflict.yml
diff --git a/bruno-yaml/conflicts/scenarios/Bulk Dismiss Conflicts.yml b/bruno/conflicts/scenarios/Bulk Dismiss Conflicts.yml
similarity index 100%
rename from bruno-yaml/conflicts/scenarios/Bulk Dismiss Conflicts.yml
rename to bruno/conflicts/scenarios/Bulk Dismiss Conflicts.yml
diff --git a/bruno-yaml/conflicts/scenarios/Bulk Resolve Conflicts.yml b/bruno/conflicts/scenarios/Bulk Resolve Conflicts.yml
similarity index 100%
rename from bruno-yaml/conflicts/scenarios/Bulk Resolve Conflicts.yml
rename to bruno/conflicts/scenarios/Bulk Resolve Conflicts.yml
diff --git a/bruno-yaml/conflicts/scenarios/Bulk Resolve Highest Progress.yml b/bruno/conflicts/scenarios/Bulk Resolve Highest Progress.yml
similarity index 100%
rename from bruno-yaml/conflicts/scenarios/Bulk Resolve Highest Progress.yml
rename to bruno/conflicts/scenarios/Bulk Resolve Highest Progress.yml
diff --git a/bruno-yaml/dashboard/create-collection-with-dashboard.yml b/bruno/dashboard/create-collection-with-dashboard.yml
similarity index 100%
rename from bruno-yaml/dashboard/create-collection-with-dashboard.yml
rename to bruno/dashboard/create-collection-with-dashboard.yml
diff --git a/bruno-yaml/dashboard/get-dashboard-sections.yml b/bruno/dashboard/get-dashboard-sections.yml
similarity index 100%
rename from bruno-yaml/dashboard/get-dashboard-sections.yml
rename to bruno/dashboard/get-dashboard-sections.yml
diff --git a/bruno-yaml/dashboard/get-sections-by-library.yml b/bruno/dashboard/get-sections-by-library.yml
similarity index 100%
rename from bruno-yaml/dashboard/get-sections-by-library.yml
rename to bruno/dashboard/get-sections-by-library.yml
diff --git a/bruno-yaml/dashboard/update-collection-visibility.yml b/bruno/dashboard/update-collection-visibility.yml
similarity index 100%
rename from bruno-yaml/dashboard/update-collection-visibility.yml
rename to bruno/dashboard/update-collection-visibility.yml
diff --git a/bruno-yaml/dashboard/update-preferences.yml b/bruno/dashboard/update-preferences.yml
similarity index 100%
rename from bruno-yaml/dashboard/update-preferences.yml
rename to bruno/dashboard/update-preferences.yml
diff --git a/bruno-yaml/devices/api.yml b/bruno/devices/api.yml
similarity index 100%
rename from bruno-yaml/devices/api.yml
rename to bruno/devices/api.yml
diff --git a/bruno-yaml/devices/kobo/Get Analytics Tests.yml b/bruno/devices/kobo/Get Analytics Tests.yml
similarity index 100%
rename from bruno-yaml/devices/kobo/Get Analytics Tests.yml
rename to bruno/devices/kobo/Get Analytics Tests.yml
diff --git a/bruno-yaml/devices/kobo/Get Kobo Library.yml b/bruno/devices/kobo/Get Kobo Library.yml
similarity index 100%
rename from bruno-yaml/devices/kobo/Get Kobo Library.yml
rename to bruno/devices/kobo/Get Kobo Library.yml
diff --git a/bruno-yaml/devices/kobo/Get Unlinked Book Suggestions.yml b/bruno/devices/kobo/Get Unlinked Book Suggestions.yml
similarity index 100%
rename from bruno-yaml/devices/kobo/Get Unlinked Book Suggestions.yml
rename to bruno/devices/kobo/Get Unlinked Book Suggestions.yml
diff --git a/bruno-yaml/devices/kobo/api.yml b/bruno/devices/kobo/api.yml
similarity index 100%
rename from bruno-yaml/devices/kobo/api.yml
rename to bruno/devices/kobo/api.yml
diff --git a/bruno-yaml/devices/kobo/scenarios/Auto Link Books.yml b/bruno/devices/kobo/scenarios/Auto Link Books.yml
similarity index 100%
rename from bruno-yaml/devices/kobo/scenarios/Auto Link Books.yml
rename to bruno/devices/kobo/scenarios/Auto Link Books.yml
diff --git a/bruno-yaml/devices/kobo/scenarios/Bulk Link Books.yml b/bruno/devices/kobo/scenarios/Bulk Link Books.yml
similarity index 100%
rename from bruno-yaml/devices/kobo/scenarios/Bulk Link Books.yml
rename to bruno/devices/kobo/scenarios/Bulk Link Books.yml
diff --git a/bruno-yaml/devices/kobo/scenarios/Kobo Initialization.yml b/bruno/devices/kobo/scenarios/Kobo Initialization.yml
similarity index 100%
rename from bruno-yaml/devices/kobo/scenarios/Kobo Initialization.yml
rename to bruno/devices/kobo/scenarios/Kobo Initialization.yml
diff --git a/bruno-yaml/devices/kobo/scenarios/Server Sync to Kobo.yml b/bruno/devices/kobo/scenarios/Server Sync to Kobo.yml
similarity index 100%
rename from bruno-yaml/devices/kobo/scenarios/Server Sync to Kobo.yml
rename to bruno/devices/kobo/scenarios/Server Sync to Kobo.yml
diff --git a/bruno-yaml/devices/kobo/scenarios/Sync Books from Server to Kobo.yml b/bruno/devices/kobo/scenarios/Sync Books from Server to Kobo.yml
similarity index 100%
rename from bruno-yaml/devices/kobo/scenarios/Sync Books from Server to Kobo.yml
rename to bruno/devices/kobo/scenarios/Sync Books from Server to Kobo.yml
diff --git a/bruno-yaml/devices/kobo/scenarios/Sync Multiple Books Progress.yml b/bruno/devices/kobo/scenarios/Sync Multiple Books Progress.yml
similarity index 100%
rename from bruno-yaml/devices/kobo/scenarios/Sync Multiple Books Progress.yml
rename to bruno/devices/kobo/scenarios/Sync Multiple Books Progress.yml
diff --git a/bruno-yaml/devices/kobo/scenarios/Sync Progress with Bookmarks.yml b/bruno/devices/kobo/scenarios/Sync Progress with Bookmarks.yml
similarity index 100%
rename from bruno-yaml/devices/kobo/scenarios/Sync Progress with Bookmarks.yml
rename to bruno/devices/kobo/scenarios/Sync Progress with Bookmarks.yml
diff --git a/bruno-yaml/devices/kobo/scenarios/Sync Reading Progress.yml b/bruno/devices/kobo/scenarios/Sync Reading Progress.yml
similarity index 100%
rename from bruno-yaml/devices/kobo/scenarios/Sync Reading Progress.yml
rename to bruno/devices/kobo/scenarios/Sync Reading Progress.yml
diff --git a/bruno-yaml/devices/kobo/scenarios/Sync Single Bookmark.yml b/bruno/devices/kobo/scenarios/Sync Single Bookmark.yml
similarity index 100%
rename from bruno-yaml/devices/kobo/scenarios/Sync Single Bookmark.yml
rename to bruno/devices/kobo/scenarios/Sync Single Bookmark.yml
diff --git a/bruno-yaml/devices/kobo/scenarios/Sync with Annotations.yml b/bruno/devices/kobo/scenarios/Sync with Annotations.yml
similarity index 100%
rename from bruno-yaml/devices/kobo/scenarios/Sync with Annotations.yml
rename to bruno/devices/kobo/scenarios/Sync with Annotations.yml
diff --git a/bruno-yaml/devices/kobo/scenarios/bookmark-sync.yml b/bruno/devices/kobo/scenarios/bookmark-sync.yml
similarity index 100%
rename from bruno-yaml/devices/kobo/scenarios/bookmark-sync.yml
rename to bruno/devices/kobo/scenarios/bookmark-sync.yml
diff --git a/bruno-yaml/devices/kobo/scenarios/get-initialization-url-token.yml b/bruno/devices/kobo/scenarios/get-initialization-url-token.yml
similarity index 100%
rename from bruno-yaml/devices/kobo/scenarios/get-initialization-url-token.yml
rename to bruno/devices/kobo/scenarios/get-initialization-url-token.yml
diff --git a/bruno-yaml/devices/kobo/scenarios/get-library-url-token.yml b/bruno/devices/kobo/scenarios/get-library-url-token.yml
similarity index 100%
rename from bruno-yaml/devices/kobo/scenarios/get-library-url-token.yml
rename to bruno/devices/kobo/scenarios/get-library-url-token.yml
diff --git a/bruno-yaml/devices/kobo/scenarios/get-unlinked-books.yml b/bruno/devices/kobo/scenarios/get-unlinked-books.yml
similarity index 100%
rename from bruno-yaml/devices/kobo/scenarios/get-unlinked-books.yml
rename to bruno/devices/kobo/scenarios/get-unlinked-books.yml
diff --git a/bruno-yaml/devices/kobo/scenarios/initialization.yml b/bruno/devices/kobo/scenarios/initialization.yml
similarity index 100%
rename from bruno-yaml/devices/kobo/scenarios/initialization.yml
rename to bruno/devices/kobo/scenarios/initialization.yml
diff --git a/bruno-yaml/devices/kobo/scenarios/link-book.yml b/bruno/devices/kobo/scenarios/link-book.yml
similarity index 100%
rename from bruno-yaml/devices/kobo/scenarios/link-book.yml
rename to bruno/devices/kobo/scenarios/link-book.yml
diff --git a/bruno-yaml/devices/kobo/scenarios/markup-sync.yml b/bruno/devices/kobo/scenarios/markup-sync.yml
similarity index 100%
rename from bruno-yaml/devices/kobo/scenarios/markup-sync.yml
rename to bruno/devices/kobo/scenarios/markup-sync.yml
diff --git a/bruno-yaml/devices/kobo/scenarios/sync-bookmark-url-token.yml b/bruno/devices/kobo/scenarios/sync-bookmark-url-token.yml
similarity index 100%
rename from bruno-yaml/devices/kobo/scenarios/sync-bookmark-url-token.yml
rename to bruno/devices/kobo/scenarios/sync-bookmark-url-token.yml
diff --git a/bruno-yaml/devices/kobo/scenarios/sync-markup-url-token.yml b/bruno/devices/kobo/scenarios/sync-markup-url-token.yml
similarity index 100%
rename from bruno-yaml/devices/kobo/scenarios/sync-markup-url-token.yml
rename to bruno/devices/kobo/scenarios/sync-markup-url-token.yml
diff --git a/bruno-yaml/devices/koreader/Get Book Metadata.yml b/bruno/devices/koreader/Get Book Metadata.yml
similarity index 100%
rename from bruno-yaml/devices/koreader/Get Book Metadata.yml
rename to bruno/devices/koreader/Get Book Metadata.yml
diff --git a/bruno-yaml/devices/koreader/Get Library.yml b/bruno/devices/koreader/Get Library.yml
similarity index 100%
rename from bruno-yaml/devices/koreader/Get Library.yml
rename to bruno/devices/koreader/Get Library.yml
diff --git a/bruno-yaml/devices/koreader/Get User Library for KOReader.yml b/bruno/devices/koreader/Get User Library for KOReader.yml
similarity index 100%
rename from bruno-yaml/devices/koreader/Get User Library for KOReader.yml
rename to bruno/devices/koreader/Get User Library for KOReader.yml
diff --git a/bruno-yaml/devices/koreader/api.yml b/bruno/devices/koreader/api.yml
similarity index 100%
rename from bruno-yaml/devices/koreader/api.yml
rename to bruno/devices/koreader/api.yml
diff --git a/bruno-yaml/devices/koreader/scenarios/Checkpoint Sync.yml b/bruno/devices/koreader/scenarios/Checkpoint Sync.yml
similarity index 100%
rename from bruno-yaml/devices/koreader/scenarios/Checkpoint Sync.yml
rename to bruno/devices/koreader/scenarios/Checkpoint Sync.yml
diff --git a/bruno-yaml/devices/koreader/scenarios/Immediate Sync - Page Turn.yml b/bruno/devices/koreader/scenarios/Immediate Sync - Page Turn.yml
similarity index 100%
rename from bruno-yaml/devices/koreader/scenarios/Immediate Sync - Page Turn.yml
rename to bruno/devices/koreader/scenarios/Immediate Sync - Page Turn.yml
diff --git a/bruno-yaml/devices/koreader/scenarios/Sync Annotations (Per-Book SHA-256).yml b/bruno/devices/koreader/scenarios/Sync Annotations (Per-Book SHA-256).yml
similarity index 100%
rename from bruno-yaml/devices/koreader/scenarios/Sync Annotations (Per-Book SHA-256).yml
rename to bruno/devices/koreader/scenarios/Sync Annotations (Per-Book SHA-256).yml
diff --git a/bruno-yaml/devices/koreader/scenarios/Sync Bookmarks (SHA-256).yml b/bruno/devices/koreader/scenarios/Sync Bookmarks (SHA-256).yml
similarity index 100%
rename from bruno-yaml/devices/koreader/scenarios/Sync Bookmarks (SHA-256).yml
rename to bruno/devices/koreader/scenarios/Sync Bookmarks (SHA-256).yml
diff --git a/bruno-yaml/devices/koreader/scenarios/Sync Bookmarks.yml b/bruno/devices/koreader/scenarios/Sync Bookmarks.yml
similarity index 100%
rename from bruno-yaml/devices/koreader/scenarios/Sync Bookmarks.yml
rename to bruno/devices/koreader/scenarios/Sync Bookmarks.yml
diff --git a/bruno-yaml/devices/koreader/scenarios/Sync Highlights.yml b/bruno/devices/koreader/scenarios/Sync Highlights.yml
similarity index 100%
rename from bruno-yaml/devices/koreader/scenarios/Sync Highlights.yml
rename to bruno/devices/koreader/scenarios/Sync Highlights.yml
diff --git a/bruno-yaml/devices/koreader/scenarios/Sync Notes.yml b/bruno/devices/koreader/scenarios/Sync Notes.yml
similarity index 100%
rename from bruno-yaml/devices/koreader/scenarios/Sync Notes.yml
rename to bruno/devices/koreader/scenarios/Sync Notes.yml
diff --git a/bruno-yaml/devices/koreader/scenarios/Sync Progress (SHA-256 Only).yml b/bruno/devices/koreader/scenarios/Sync Progress (SHA-256 Only).yml
similarity index 100%
rename from bruno-yaml/devices/koreader/scenarios/Sync Progress (SHA-256 Only).yml
rename to bruno/devices/koreader/scenarios/Sync Progress (SHA-256 Only).yml
diff --git a/bruno-yaml/devices/koreader/scenarios/Sync Progress (SHA-256).yml b/bruno/devices/koreader/scenarios/Sync Progress (SHA-256).yml
similarity index 100%
rename from bruno-yaml/devices/koreader/scenarios/Sync Progress (SHA-256).yml
rename to bruno/devices/koreader/scenarios/Sync Progress (SHA-256).yml
diff --git a/bruno-yaml/devices/koreader/scenarios/Sync Progress - Multiple Books.yml b/bruno/devices/koreader/scenarios/Sync Progress - Multiple Books.yml
similarity index 100%
rename from bruno-yaml/devices/koreader/scenarios/Sync Progress - Multiple Books.yml
rename to bruno/devices/koreader/scenarios/Sync Progress - Multiple Books.yml
diff --git a/bruno-yaml/devices/koreader/scenarios/Sync Progress - Single Book.yml b/bruno/devices/koreader/scenarios/Sync Progress - Single Book.yml
similarity index 100%
rename from bruno-yaml/devices/koreader/scenarios/Sync Progress - Single Book.yml
rename to bruno/devices/koreader/scenarios/Sync Progress - Single Book.yml
diff --git a/bruno-yaml/devices/koreader/scenarios/Sync Progress - With Bookmarks.yml b/bruno/devices/koreader/scenarios/Sync Progress - With Bookmarks.yml
similarity index 100%
rename from bruno-yaml/devices/koreader/scenarios/Sync Progress - With Bookmarks.yml
rename to bruno/devices/koreader/scenarios/Sync Progress - With Bookmarks.yml
diff --git a/bruno-yaml/devices/koreader/scenarios/Sync Progress - With Highlights and Notes.yml b/bruno/devices/koreader/scenarios/Sync Progress - With Highlights and Notes.yml
similarity index 100%
rename from bruno-yaml/devices/koreader/scenarios/Sync Progress - With Highlights and Notes.yml
rename to bruno/devices/koreader/scenarios/Sync Progress - With Highlights and Notes.yml
diff --git a/bruno-yaml/devices/koreader/scenarios/Sync Progress.yml b/bruno/devices/koreader/scenarios/Sync Progress.yml
similarity index 100%
rename from bruno-yaml/devices/koreader/scenarios/Sync Progress.yml
rename to bruno/devices/koreader/scenarios/Sync Progress.yml
diff --git a/bruno-yaml/devices/scenarios/Add Books to Kobo Shelf.yml b/bruno/devices/scenarios/Add Books to Kobo Shelf.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/Add Books to Kobo Shelf.yml
rename to bruno/devices/scenarios/Add Books to Kobo Shelf.yml
diff --git a/bruno-yaml/devices/scenarios/Approve Device Registration.yml b/bruno/devices/scenarios/Approve Device Registration.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/Approve Device Registration.yml
rename to bruno/devices/scenarios/Approve Device Registration.yml
diff --git a/bruno-yaml/devices/scenarios/Approve Registration - KOReader.yml b/bruno/devices/scenarios/Approve Registration - KOReader.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/Approve Registration - KOReader.yml
rename to bruno/devices/scenarios/Approve Registration - KOReader.yml
diff --git a/bruno-yaml/devices/scenarios/Approve Registration - Kobo.yml b/bruno/devices/scenarios/Approve Registration - Kobo.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/Approve Registration - Kobo.yml
rename to bruno/devices/scenarios/Approve Registration - Kobo.yml
diff --git a/bruno-yaml/devices/scenarios/Check Pending Registration.yml b/bruno/devices/scenarios/Check Pending Registration.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/Check Pending Registration.yml
rename to bruno/devices/scenarios/Check Pending Registration.yml
diff --git a/bruno-yaml/devices/scenarios/Check Registration Status.yml b/bruno/devices/scenarios/Check Registration Status.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/Check Registration Status.yml
rename to bruno/devices/scenarios/Check Registration Status.yml
diff --git a/bruno-yaml/devices/scenarios/Clear Kobo Shelf.yml b/bruno/devices/scenarios/Clear Kobo Shelf.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/Clear Kobo Shelf.yml
rename to bruno/devices/scenarios/Clear Kobo Shelf.yml
diff --git a/bruno-yaml/devices/scenarios/Create Device File Alias.yml b/bruno/devices/scenarios/Create Device File Alias.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/Create Device File Alias.yml
rename to bruno/devices/scenarios/Create Device File Alias.yml
diff --git a/bruno-yaml/devices/scenarios/Delete Device.yml b/bruno/devices/scenarios/Delete Device.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/Delete Device.yml
rename to bruno/devices/scenarios/Delete Device.yml
diff --git a/bruno-yaml/devices/scenarios/Disable Device Sync.yml b/bruno/devices/scenarios/Disable Device Sync.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/Disable Device Sync.yml
rename to bruno/devices/scenarios/Disable Device Sync.yml
diff --git a/bruno-yaml/devices/scenarios/Get Device File Aliases.yml b/bruno/devices/scenarios/Get Device File Aliases.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/Get Device File Aliases.yml
rename to bruno/devices/scenarios/Get Device File Aliases.yml
diff --git a/bruno-yaml/devices/scenarios/Get Device.yml b/bruno/devices/scenarios/Get Device.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/Get Device.yml
rename to bruno/devices/scenarios/Get Device.yml
diff --git a/bruno-yaml/devices/scenarios/Get Kobo Shelf.yml b/bruno/devices/scenarios/Get Kobo Shelf.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/Get Kobo Shelf.yml
rename to bruno/devices/scenarios/Get Kobo Shelf.yml
diff --git a/bruno-yaml/devices/scenarios/Initiate Device Registration.yml b/bruno/devices/scenarios/Initiate Device Registration.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/Initiate Device Registration.yml
rename to bruno/devices/scenarios/Initiate Device Registration.yml
diff --git a/bruno-yaml/devices/scenarios/List Devices.yml b/bruno/devices/scenarios/List Devices.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/List Devices.yml
rename to bruno/devices/scenarios/List Devices.yml
diff --git a/bruno-yaml/devices/scenarios/List Pending Registrations.yml b/bruno/devices/scenarios/List Pending Registrations.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/List Pending Registrations.yml
rename to bruno/devices/scenarios/List Pending Registrations.yml
diff --git a/bruno-yaml/devices/scenarios/Register Device.yml b/bruno/devices/scenarios/Register Device.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/Register Device.yml
rename to bruno/devices/scenarios/Register Device.yml
diff --git a/bruno-yaml/devices/scenarios/Register KOReader Device.yml b/bruno/devices/scenarios/Register KOReader Device.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/Register KOReader Device.yml
rename to bruno/devices/scenarios/Register KOReader Device.yml
diff --git a/bruno-yaml/devices/scenarios/Register Web Device.yml b/bruno/devices/scenarios/Register Web Device.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/Register Web Device.yml
rename to bruno/devices/scenarios/Register Web Device.yml
diff --git a/bruno-yaml/devices/scenarios/Reject Device Registration.yml b/bruno/devices/scenarios/Reject Device Registration.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/Reject Device Registration.yml
rename to bruno/devices/scenarios/Reject Device Registration.yml
diff --git a/bruno-yaml/devices/scenarios/Reject Registration - KOReader.yml b/bruno/devices/scenarios/Reject Registration - KOReader.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/Reject Registration - KOReader.yml
rename to bruno/devices/scenarios/Reject Registration - KOReader.yml
diff --git a/bruno-yaml/devices/scenarios/Reject Registration - Kobo.yml b/bruno/devices/scenarios/Reject Registration - Kobo.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/Reject Registration - Kobo.yml
rename to bruno/devices/scenarios/Reject Registration - Kobo.yml
diff --git a/bruno-yaml/devices/scenarios/Remove Book from Kobo Shelf.yml b/bruno/devices/scenarios/Remove Book from Kobo Shelf.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/Remove Book from Kobo Shelf.yml
rename to bruno/devices/scenarios/Remove Book from Kobo Shelf.yml
diff --git a/bruno-yaml/devices/scenarios/Update Device Settings.yml b/bruno/devices/scenarios/Update Device Settings.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/Update Device Settings.yml
rename to bruno/devices/scenarios/Update Device Settings.yml
diff --git a/bruno-yaml/devices/scenarios/Update Device.yml b/bruno/devices/scenarios/Update Device.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/Update Device.yml
rename to bruno/devices/scenarios/Update Device.yml
diff --git a/bruno-yaml/devices/scenarios/Update Sync Frequency.yml b/bruno/devices/scenarios/Update Sync Frequency.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/Update Sync Frequency.yml
rename to bruno/devices/scenarios/Update Sync Frequency.yml
diff --git a/bruno-yaml/devices/scenarios/regenerate-token-forbidden.yml b/bruno/devices/scenarios/regenerate-token-forbidden.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/regenerate-token-forbidden.yml
rename to bruno/devices/scenarios/regenerate-token-forbidden.yml
diff --git a/bruno-yaml/devices/scenarios/regenerate-token-notfound.yml b/bruno/devices/scenarios/regenerate-token-notfound.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/regenerate-token-notfound.yml
rename to bruno/devices/scenarios/regenerate-token-notfound.yml
diff --git a/bruno-yaml/devices/scenarios/regenerate-token-unauthorized.yml b/bruno/devices/scenarios/regenerate-token-unauthorized.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/regenerate-token-unauthorized.yml
rename to bruno/devices/scenarios/regenerate-token-unauthorized.yml
diff --git a/bruno-yaml/devices/scenarios/regenerate-token.yml b/bruno/devices/scenarios/regenerate-token.yml
similarity index 100%
rename from bruno-yaml/devices/scenarios/regenerate-token.yml
rename to bruno/devices/scenarios/regenerate-token.yml
diff --git a/bruno-yaml/environments/Bookhoard.yml b/bruno/environments/Bookhoard.yml
similarity index 100%
rename from bruno-yaml/environments/Bookhoard.yml
rename to bruno/environments/Bookhoard.yml
diff --git a/bruno-yaml/highlights/Create Media Highlight.yml b/bruno/highlights/Create Media Highlight.yml
similarity index 100%
rename from bruno-yaml/highlights/Create Media Highlight.yml
rename to bruno/highlights/Create Media Highlight.yml
diff --git a/bruno-yaml/highlights/Delete Media Highlight.yml b/bruno/highlights/Delete Media Highlight.yml
similarity index 100%
rename from bruno-yaml/highlights/Delete Media Highlight.yml
rename to bruno/highlights/Delete Media Highlight.yml
diff --git a/bruno-yaml/highlights/Get Media Highlights.yml b/bruno/highlights/Get Media Highlights.yml
similarity index 100%
rename from bruno-yaml/highlights/Get Media Highlights.yml
rename to bruno/highlights/Get Media Highlights.yml
diff --git a/bruno-yaml/highlights/Get Single Media Highlight.yml b/bruno/highlights/Get Single Media Highlight.yml
similarity index 100%
rename from bruno-yaml/highlights/Get Single Media Highlight.yml
rename to bruno/highlights/Get Single Media Highlight.yml
diff --git a/bruno-yaml/highlights/Update Media Highlight.yml b/bruno/highlights/Update Media Highlight.yml
similarity index 100%
rename from bruno-yaml/highlights/Update Media Highlight.yml
rename to bruno/highlights/Update Media Highlight.yml
diff --git a/bruno-yaml/library/Add Library Folder.yml b/bruno/library/Add Library Folder.yml
similarity index 100%
rename from bruno-yaml/library/Add Library Folder.yml
rename to bruno/library/Add Library Folder.yml
diff --git a/bruno-yaml/library/Create Library.yml b/bruno/library/Create Library.yml
similarity index 100%
rename from bruno-yaml/library/Create Library.yml
rename to bruno/library/Create Library.yml
diff --git a/bruno-yaml/library/Delete Library Folder.yml b/bruno/library/Delete Library Folder.yml
similarity index 100%
rename from bruno-yaml/library/Delete Library Folder.yml
rename to bruno/library/Delete Library Folder.yml
diff --git a/bruno-yaml/library/Delete Library.yml b/bruno/library/Delete Library.yml
similarity index 100%
rename from bruno-yaml/library/Delete Library.yml
rename to bruno/library/Delete Library.yml
diff --git a/bruno-yaml/library/Get Libraries (Admin).yml b/bruno/library/Get Libraries (Admin).yml
similarity index 100%
rename from bruno-yaml/library/Get Libraries (Admin).yml
rename to bruno/library/Get Libraries (Admin).yml
diff --git a/bruno-yaml/library/Get Library Folders.yml b/bruno/library/Get Library Folders.yml
similarity index 100%
rename from bruno-yaml/library/Get Library Folders.yml
rename to bruno/library/Get Library Folders.yml
diff --git a/bruno-yaml/library/Get Library Stats.yml b/bruno/library/Get Library Stats.yml
similarity index 100%
rename from bruno-yaml/library/Get Library Stats.yml
rename to bruno/library/Get Library Stats.yml
diff --git a/bruno-yaml/library/Get Library Types.yml b/bruno/library/Get Library Types.yml
similarity index 100%
rename from bruno-yaml/library/Get Library Types.yml
rename to bruno/library/Get Library Types.yml
diff --git a/bruno-yaml/library/Get Library.yml b/bruno/library/Get Library.yml
similarity index 100%
rename from bruno-yaml/library/Get Library.yml
rename to bruno/library/Get Library.yml
diff --git a/bruno-yaml/library/Get Scan Settings.yml b/bruno/library/Get Scan Settings.yml
similarity index 100%
rename from bruno-yaml/library/Get Scan Settings.yml
rename to bruno/library/Get Scan Settings.yml
diff --git a/bruno-yaml/library/Get User Visible Libraries.yml b/bruno/library/Get User Visible Libraries.yml
similarity index 100%
rename from bruno-yaml/library/Get User Visible Libraries.yml
rename to bruno/library/Get User Visible Libraries.yml
diff --git a/bruno-yaml/library/Set Library Visibility.yml b/bruno/library/Set Library Visibility.yml
similarity index 100%
rename from bruno-yaml/library/Set Library Visibility.yml
rename to bruno/library/Set Library Visibility.yml
diff --git a/bruno-yaml/library/Update Library.yml b/bruno/library/Update Library.yml
similarity index 100%
rename from bruno-yaml/library/Update Library.yml
rename to bruno/library/Update Library.yml
diff --git a/bruno-yaml/library/Update Scan Settings.yml b/bruno/library/Update Scan Settings.yml
similarity index 100%
rename from bruno-yaml/library/Update Scan Settings.yml
rename to bruno/library/Update Scan Settings.yml
diff --git a/bruno-yaml/media-items/Create Media Item.yml b/bruno/media-items/Create Media Item.yml
similarity index 100%
rename from bruno-yaml/media-items/Create Media Item.yml
rename to bruno/media-items/Create Media Item.yml
diff --git a/bruno-yaml/media-items/Create Media Rating.yml b/bruno/media-items/Create Media Rating.yml
similarity index 100%
rename from bruno-yaml/media-items/Create Media Rating.yml
rename to bruno/media-items/Create Media Rating.yml
diff --git a/bruno-yaml/media-items/Delete Media Item.yml b/bruno/media-items/Delete Media Item.yml
similarity index 100%
rename from bruno-yaml/media-items/Delete Media Item.yml
rename to bruno/media-items/Delete Media Item.yml
diff --git a/bruno-yaml/media-items/Delete Media Rating.yml b/bruno/media-items/Delete Media Rating.yml
similarity index 100%
rename from bruno-yaml/media-items/Delete Media Rating.yml
rename to bruno/media-items/Delete Media Rating.yml
diff --git a/bruno-yaml/media-items/EPUB Download.yml b/bruno/media-items/EPUB Download.yml
similarity index 100%
rename from bruno-yaml/media-items/EPUB Download.yml
rename to bruno/media-items/EPUB Download.yml
diff --git a/bruno-yaml/media-items/Get Media Item.yml b/bruno/media-items/Get Media Item.yml
similarity index 100%
rename from bruno-yaml/media-items/Get Media Item.yml
rename to bruno/media-items/Get Media Item.yml
diff --git a/bruno-yaml/media-items/Get Media Rating.yml b/bruno/media-items/Get Media Rating.yml
similarity index 100%
rename from bruno-yaml/media-items/Get Media Rating.yml
rename to bruno/media-items/Get Media Rating.yml
diff --git a/bruno-yaml/media-items/Update Media Item.yml b/bruno/media-items/Update Media Item.yml
similarity index 100%
rename from bruno-yaml/media-items/Update Media Item.yml
rename to bruno/media-items/Update Media Item.yml
diff --git a/bruno-yaml/media-items/Update Media Rating.yml b/bruno/media-items/Update Media Rating.yml
similarity index 100%
rename from bruno-yaml/media-items/Update Media Rating.yml
rename to bruno/media-items/Update Media Rating.yml
diff --git a/bruno-yaml/media-items/scenarios/Filter Media Items.yml b/bruno/media-items/scenarios/Filter Media Items.yml
similarity index 100%
rename from bruno-yaml/media-items/scenarios/Filter Media Items.yml
rename to bruno/media-items/scenarios/Filter Media Items.yml
diff --git a/bruno-yaml/media-items/scenarios/List Media Items Sorted.yml b/bruno/media-items/scenarios/List Media Items Sorted.yml
similarity index 100%
rename from bruno-yaml/media-items/scenarios/List Media Items Sorted.yml
rename to bruno/media-items/scenarios/List Media Items Sorted.yml
diff --git a/bruno-yaml/media-items/scenarios/List Media Items.yml b/bruno/media-items/scenarios/List Media Items.yml
similarity index 100%
rename from bruno-yaml/media-items/scenarios/List Media Items.yml
rename to bruno/media-items/scenarios/List Media Items.yml
diff --git a/bruno-yaml/media-items/scenarios/Search Media Items.yml b/bruno/media-items/scenarios/Search Media Items.yml
similarity index 100%
rename from bruno-yaml/media-items/scenarios/Search Media Items.yml
rename to bruno/media-items/scenarios/Search Media Items.yml
diff --git a/bruno-yaml/notes/Create Media Note.yml b/bruno/notes/Create Media Note.yml
similarity index 100%
rename from bruno-yaml/notes/Create Media Note.yml
rename to bruno/notes/Create Media Note.yml
diff --git a/bruno-yaml/notes/Delete Media Note.yml b/bruno/notes/Delete Media Note.yml
similarity index 100%
rename from bruno-yaml/notes/Delete Media Note.yml
rename to bruno/notes/Delete Media Note.yml
diff --git a/bruno-yaml/notes/Get Media Notes.yml b/bruno/notes/Get Media Notes.yml
similarity index 100%
rename from bruno-yaml/notes/Get Media Notes.yml
rename to bruno/notes/Get Media Notes.yml
diff --git a/bruno-yaml/notes/Get Single Media Note.yml b/bruno/notes/Get Single Media Note.yml
similarity index 100%
rename from bruno-yaml/notes/Get Single Media Note.yml
rename to bruno/notes/Get Single Media Note.yml
diff --git a/bruno-yaml/notes/Update Media Note.yml b/bruno/notes/Update Media Note.yml
similarity index 100%
rename from bruno-yaml/notes/Update Media Note.yml
rename to bruno/notes/Update Media Note.yml
diff --git a/bruno-yaml/opds/Download Book EPUB.yml b/bruno/opds/Download Book EPUB.yml
similarity index 100%
rename from bruno-yaml/opds/Download Book EPUB.yml
rename to bruno/opds/Download Book EPUB.yml
diff --git a/bruno-yaml/opds/Download Book KEPUB (On-the-fly Conversion).yml b/bruno/opds/Download Book KEPUB (On-the-fly Conversion).yml
similarity index 100%
rename from bruno-yaml/opds/Download Book KEPUB (On-the-fly Conversion).yml
rename to bruno/opds/Download Book KEPUB (On-the-fly Conversion).yml
diff --git a/bruno-yaml/opds/Download Book KEPUB.yml b/bruno/opds/Download Book KEPUB.yml
similarity index 100%
rename from bruno-yaml/opds/Download Book KEPUB.yml
rename to bruno/opds/Download Book KEPUB.yml
diff --git a/bruno-yaml/opds/Get Cover Image.yml b/bruno/opds/Get Cover Image.yml
similarity index 100%
rename from bruno-yaml/opds/Get Cover Image.yml
rename to bruno/opds/Get Cover Image.yml
diff --git a/bruno-yaml/opds/Get Device Catalog.yml b/bruno/opds/Get Device Catalog.yml
similarity index 100%
rename from bruno-yaml/opds/Get Device Catalog.yml
rename to bruno/opds/Get Device Catalog.yml
diff --git a/bruno-yaml/opds/Get Device Navigation.yml b/bruno/opds/Get Device Navigation.yml
similarity index 100%
rename from bruno-yaml/opds/Get Device Navigation.yml
rename to bruno/opds/Get Device Navigation.yml
diff --git a/bruno-yaml/opds/List Formats.yml b/bruno/opds/List Formats.yml
similarity index 100%
rename from bruno-yaml/opds/List Formats.yml
rename to bruno/opds/List Formats.yml
diff --git a/bruno-yaml/opds/Search Device Catalog.yml b/bruno/opds/Search Device Catalog.yml
similarity index 100%
rename from bruno-yaml/opds/Search Device Catalog.yml
rename to bruno/opds/Search Device Catalog.yml
diff --git a/bruno-yaml/opds/scenarios/Download Book - Query Token.yml b/bruno/opds/scenarios/Download Book - Query Token.yml
similarity index 100%
rename from bruno-yaml/opds/scenarios/Download Book - Query Token.yml
rename to bruno/opds/scenarios/Download Book - Query Token.yml
diff --git a/bruno-yaml/opds/scenarios/Get Device Catalog - Bearer.yml b/bruno/opds/scenarios/Get Device Catalog - Bearer.yml
similarity index 100%
rename from bruno-yaml/opds/scenarios/Get Device Catalog - Bearer.yml
rename to bruno/opds/scenarios/Get Device Catalog - Bearer.yml
diff --git a/bruno-yaml/opds/scenarios/Get Device Catalog - Query Token.yml b/bruno/opds/scenarios/Get Device Catalog - Query Token.yml
similarity index 100%
rename from bruno-yaml/opds/scenarios/Get Device Catalog - Query Token.yml
rename to bruno/opds/scenarios/Get Device Catalog - Query Token.yml
diff --git a/bruno-yaml/opencollection.yml b/bruno/opencollection.yml
similarity index 100%
rename from bruno-yaml/opencollection.yml
rename to bruno/opencollection.yml
diff --git a/bruno-yaml/progress/Delete Reading Progress.yml b/bruno/progress/Delete Reading Progress.yml
similarity index 100%
rename from bruno-yaml/progress/Delete Reading Progress.yml
rename to bruno/progress/Delete Reading Progress.yml
diff --git a/bruno-yaml/progress/Get Reading Progress.yml b/bruno/progress/Get Reading Progress.yml
similarity index 100%
rename from bruno-yaml/progress/Get Reading Progress.yml
rename to bruno/progress/Get Reading Progress.yml
diff --git a/bruno-yaml/progress/Update Reading Progress.yml b/bruno/progress/Update Reading Progress.yml
similarity index 100%
rename from bruno-yaml/progress/Update Reading Progress.yml
rename to bruno/progress/Update Reading Progress.yml
diff --git a/bruno-yaml/queue/Clear Device Queue.yml b/bruno/queue/Clear Device Queue.yml
similarity index 100%
rename from bruno-yaml/queue/Clear Device Queue.yml
rename to bruno/queue/Clear Device Queue.yml
diff --git a/bruno-yaml/queue/Clear Failed Items.yml b/bruno/queue/Clear Failed Items.yml
similarity index 100%
rename from bruno-yaml/queue/Clear Failed Items.yml
rename to bruno/queue/Clear Failed Items.yml
diff --git a/bruno-yaml/queue/Delete Queue Item.yml b/bruno/queue/Delete Queue Item.yml
similarity index 100%
rename from bruno-yaml/queue/Delete Queue Item.yml
rename to bruno/queue/Delete Queue Item.yml
diff --git a/bruno-yaml/queue/Get Queue Statistics.yml b/bruno/queue/Get Queue Statistics.yml
similarity index 100%
rename from bruno-yaml/queue/Get Queue Statistics.yml
rename to bruno/queue/Get Queue Statistics.yml
diff --git a/bruno-yaml/queue/List All Queue Items (Admin).yml b/bruno/queue/List All Queue Items (Admin).yml
similarity index 100%
rename from bruno-yaml/queue/List All Queue Items (Admin).yml
rename to bruno/queue/List All Queue Items (Admin).yml
diff --git a/bruno-yaml/queue/List Device Queue Items.yml b/bruno/queue/List Device Queue Items.yml
similarity index 100%
rename from bruno-yaml/queue/List Device Queue Items.yml
rename to bruno/queue/List Device Queue Items.yml
diff --git a/bruno-yaml/queue/List Queue Items (Pagination).yml b/bruno/queue/List Queue Items (Pagination).yml
similarity index 100%
rename from bruno-yaml/queue/List Queue Items (Pagination).yml
rename to bruno/queue/List Queue Items (Pagination).yml
diff --git a/bruno-yaml/queue/Process Queue Item.yml b/bruno/queue/Process Queue Item.yml
similarity index 100%
rename from bruno-yaml/queue/Process Queue Item.yml
rename to bruno/queue/Process Queue Item.yml
diff --git a/bruno-yaml/queue/Retry Queue Item.yml b/bruno/queue/Retry Queue Item.yml
similarity index 100%
rename from bruno-yaml/queue/Retry Queue Item.yml
rename to bruno/queue/Retry Queue Item.yml
diff --git a/bruno-yaml/queue/api.yml b/bruno/queue/api.yml
similarity index 100%
rename from bruno-yaml/queue/api.yml
rename to bruno/queue/api.yml
diff --git a/bruno-yaml/queue/scenarios/Filter by Status - Completed.yml b/bruno/queue/scenarios/Filter by Status - Completed.yml
similarity index 100%
rename from bruno-yaml/queue/scenarios/Filter by Status - Completed.yml
rename to bruno/queue/scenarios/Filter by Status - Completed.yml
diff --git a/bruno-yaml/queue/scenarios/Filter by Status - Failed.yml b/bruno/queue/scenarios/Filter by Status - Failed.yml
similarity index 100%
rename from bruno-yaml/queue/scenarios/Filter by Status - Failed.yml
rename to bruno/queue/scenarios/Filter by Status - Failed.yml
diff --git a/bruno-yaml/queue/scenarios/Filter by Status - Pending.yml b/bruno/queue/scenarios/Filter by Status - Pending.yml
similarity index 100%
rename from bruno-yaml/queue/scenarios/Filter by Status - Pending.yml
rename to bruno/queue/scenarios/Filter by Status - Pending.yml
diff --git a/bruno-yaml/queue/scenarios/Filter by Type - Bookmarks.yml b/bruno/queue/scenarios/Filter by Type - Bookmarks.yml
similarity index 100%
rename from bruno-yaml/queue/scenarios/Filter by Type - Bookmarks.yml
rename to bruno/queue/scenarios/Filter by Type - Bookmarks.yml
diff --git a/bruno-yaml/queue/scenarios/Filter by Type - Highlights.yml b/bruno/queue/scenarios/Filter by Type - Highlights.yml
similarity index 100%
rename from bruno-yaml/queue/scenarios/Filter by Type - Highlights.yml
rename to bruno/queue/scenarios/Filter by Type - Highlights.yml
diff --git a/bruno-yaml/queue/scenarios/Filter by Type - Notes.yml b/bruno/queue/scenarios/Filter by Type - Notes.yml
similarity index 100%
rename from bruno-yaml/queue/scenarios/Filter by Type - Notes.yml
rename to bruno/queue/scenarios/Filter by Type - Notes.yml
diff --git a/bruno-yaml/queue/scenarios/Filter by Type - Progress.yml b/bruno/queue/scenarios/Filter by Type - Progress.yml
similarity index 100%
rename from bruno-yaml/queue/scenarios/Filter by Type - Progress.yml
rename to bruno/queue/scenarios/Filter by Type - Progress.yml
diff --git a/bruno-yaml/queue/scenarios/Get Device Queue Stats.yml b/bruno/queue/scenarios/Get Device Queue Stats.yml
similarity index 100%
rename from bruno-yaml/queue/scenarios/Get Device Queue Stats.yml
rename to bruno/queue/scenarios/Get Device Queue Stats.yml
diff --git a/bruno-yaml/scanner/Get Scan Status.yml b/bruno/scanner/Get Scan Status.yml
similarity index 100%
rename from bruno-yaml/scanner/Get Scan Status.yml
rename to bruno/scanner/Get Scan Status.yml
diff --git a/bruno-yaml/scanner/Get Watch Mode Status.yml b/bruno/scanner/Get Watch Mode Status.yml
similarity index 100%
rename from bruno-yaml/scanner/Get Watch Mode Status.yml
rename to bruno/scanner/Get Watch Mode Status.yml
diff --git a/bruno-yaml/scanner/Scan Media Items.yml b/bruno/scanner/Scan Media Items.yml
similarity index 100%
rename from bruno-yaml/scanner/Scan Media Items.yml
rename to bruno/scanner/Scan Media Items.yml
diff --git a/bruno-yaml/scanner/Start Scanner.yml b/bruno/scanner/Start Scanner.yml
similarity index 100%
rename from bruno-yaml/scanner/Start Scanner.yml
rename to bruno/scanner/Start Scanner.yml
diff --git a/bruno-yaml/scanner/Start Watch Mode.yml b/bruno/scanner/Start Watch Mode.yml
similarity index 100%
rename from bruno-yaml/scanner/Start Watch Mode.yml
rename to bruno/scanner/Start Watch Mode.yml
diff --git a/bruno-yaml/scanner/Stop Scanner.yml b/bruno/scanner/Stop Scanner.yml
similarity index 100%
rename from bruno-yaml/scanner/Stop Scanner.yml
rename to bruno/scanner/Stop Scanner.yml
diff --git a/bruno-yaml/scanner/Stop Watch Mode.yml b/bruno/scanner/Stop Watch Mode.yml
similarity index 100%
rename from bruno-yaml/scanner/Stop Watch Mode.yml
rename to bruno/scanner/Stop Watch Mode.yml
diff --git a/bruno-yaml/sidecar/Download Device Sidecar File.yml b/bruno/sidecar/Download Device Sidecar File.yml
similarity index 100%
rename from bruno-yaml/sidecar/Download Device Sidecar File.yml
rename to bruno/sidecar/Download Device Sidecar File.yml
diff --git a/bruno-yaml/sidecar/Get Device Sidecar Config.yml b/bruno/sidecar/Get Device Sidecar Config.yml
similarity index 100%
rename from bruno-yaml/sidecar/Get Device Sidecar Config.yml
rename to bruno/sidecar/Get Device Sidecar Config.yml
diff --git a/bruno-yaml/sidecar/Get System Configuration.yml b/bruno/sidecar/Get System Configuration.yml
similarity index 100%
rename from bruno-yaml/sidecar/Get System Configuration.yml
rename to bruno/sidecar/Get System Configuration.yml
diff --git a/bruno-yaml/sidecar/Update System Configuration.yml b/bruno/sidecar/Update System Configuration.yml
similarity index 100%
rename from bruno-yaml/sidecar/Update System Configuration.yml
rename to bruno/sidecar/Update System Configuration.yml
diff --git a/bruno-yaml/system/get-scan-settings.yml b/bruno/system/get-scan-settings.yml
similarity index 100%
rename from bruno-yaml/system/get-scan-settings.yml
rename to bruno/system/get-scan-settings.yml
diff --git a/bruno-yaml/system/update-scan-settings.yml b/bruno/system/update-scan-settings.yml
similarity index 100%
rename from bruno-yaml/system/update-scan-settings.yml
rename to bruno/system/update-scan-settings.yml
diff --git a/bruno-yaml/universal-progress/Get Progress History.yml b/bruno/universal-progress/Get Progress History.yml
similarity index 100%
rename from bruno-yaml/universal-progress/Get Progress History.yml
rename to bruno/universal-progress/Get Progress History.yml
diff --git a/bruno-yaml/universal-progress/Get Universal Progress.yml b/bruno/universal-progress/Get Universal Progress.yml
similarity index 100%
rename from bruno-yaml/universal-progress/Get Universal Progress.yml
rename to bruno/universal-progress/Get Universal Progress.yml
diff --git a/bruno-yaml/universal-progress/Update Universal Progress.yml b/bruno/universal-progress/Update Universal Progress.yml
similarity index 100%
rename from bruno-yaml/universal-progress/Update Universal Progress.yml
rename to bruno/universal-progress/Update Universal Progress.yml
diff --git a/bruno-yaml/user/admin/Delete Account.yml b/bruno/user/admin/Delete Account.yml
similarity index 100%
rename from bruno-yaml/user/admin/Delete Account.yml
rename to bruno/user/admin/Delete Account.yml
diff --git a/bruno-yaml/user/admin/List Users.yml b/bruno/user/admin/List Users.yml
similarity index 100%
rename from bruno-yaml/user/admin/List Users.yml
rename to bruno/user/admin/List Users.yml
diff --git a/bruno-yaml/user/admin/Register Admin User.yml b/bruno/user/admin/Register Admin User.yml
similarity index 100%
rename from bruno-yaml/user/admin/Register Admin User.yml
rename to bruno/user/admin/Register Admin User.yml
diff --git a/bruno-yaml/user/admin/Update User Max Devices.yml b/bruno/user/admin/Update User Max Devices.yml
similarity index 100%
rename from bruno-yaml/user/admin/Update User Max Devices.yml
rename to bruno/user/admin/Update User Max Devices.yml
diff --git a/bruno-yaml/user/admin/scenarios/Delete User Account (Admin).yml b/bruno/user/admin/scenarios/Delete User Account (Admin).yml
similarity index 100%
rename from bruno-yaml/user/admin/scenarios/Delete User Account (Admin).yml
rename to bruno/user/admin/scenarios/Delete User Account (Admin).yml
diff --git a/bruno-yaml/user/admin/scenarios/Update User Max Devices - Invalid Too High.yml b/bruno/user/admin/scenarios/Update User Max Devices - Invalid Too High.yml
similarity index 100%
rename from bruno-yaml/user/admin/scenarios/Update User Max Devices - Invalid Too High.yml
rename to bruno/user/admin/scenarios/Update User Max Devices - Invalid Too High.yml
diff --git a/bruno-yaml/user/admin/scenarios/Update User Max Devices - Invalid Zero.yml b/bruno/user/admin/scenarios/Update User Max Devices - Invalid Zero.yml
similarity index 100%
rename from bruno-yaml/user/admin/scenarios/Update User Max Devices - Invalid Zero.yml
rename to bruno/user/admin/scenarios/Update User Max Devices - Invalid Zero.yml
diff --git a/bruno-yaml/user/admin/scenarios/Update User Max Devices - Missing ID.yml b/bruno/user/admin/scenarios/Update User Max Devices - Missing ID.yml
similarity index 100%
rename from bruno-yaml/user/admin/scenarios/Update User Max Devices - Missing ID.yml
rename to bruno/user/admin/scenarios/Update User Max Devices - Missing ID.yml
diff --git a/bruno-yaml/user/admin/scenarios/Update User Max Devices - Success.yml b/bruno/user/admin/scenarios/Update User Max Devices - Success.yml
similarity index 100%
rename from bruno-yaml/user/admin/scenarios/Update User Max Devices - Success.yml
rename to bruno/user/admin/scenarios/Update User Max Devices - Success.yml
diff --git a/bruno-yaml/user/auth/Login User.yml b/bruno/user/auth/Login User.yml
similarity index 100%
rename from bruno-yaml/user/auth/Login User.yml
rename to bruno/user/auth/Login User.yml
diff --git a/bruno-yaml/user/auth/Logout User.yml b/bruno/user/auth/Logout User.yml
similarity index 100%
rename from bruno-yaml/user/auth/Logout User.yml
rename to bruno/user/auth/Logout User.yml
diff --git a/bruno-yaml/user/auth/Refresh Token.yml b/bruno/user/auth/Refresh Token.yml
similarity index 100%
rename from bruno-yaml/user/auth/Refresh Token.yml
rename to bruno/user/auth/Refresh Token.yml
diff --git a/bruno-yaml/user/auth/Register User.yml b/bruno/user/auth/Register User.yml
similarity index 100%
rename from bruno-yaml/user/auth/Register User.yml
rename to bruno/user/auth/Register User.yml
diff --git a/bruno-yaml/user/profile/Get Profile.yml b/bruno/user/profile/Get Profile.yml
similarity index 100%
rename from bruno-yaml/user/profile/Get Profile.yml
rename to bruno/user/profile/Get Profile.yml
diff --git a/bruno-yaml/user/profile/Update Email.yml b/bruno/user/profile/Update Email.yml
similarity index 100%
rename from bruno-yaml/user/profile/Update Email.yml
rename to bruno/user/profile/Update Email.yml
diff --git a/bruno-yaml/user/profile/Update Password.yml b/bruno/user/profile/Update Password.yml
similarity index 100%
rename from bruno-yaml/user/profile/Update Password.yml
rename to bruno/user/profile/Update Password.yml
diff --git a/bruno-yaml/user/profile/Update Profile.yml b/bruno/user/profile/Update Profile.yml
similarity index 100%
rename from bruno-yaml/user/profile/Update Profile.yml
rename to bruno/user/profile/Update Profile.yml
diff --git a/bruno-yaml/user/profile/Update Theme.yml b/bruno/user/profile/Update Theme.yml
similarity index 100%
rename from bruno-yaml/user/profile/Update Theme.yml
rename to bruno/user/profile/Update Theme.yml
diff --git a/bruno-yaml/user/profile/Update Username.yml b/bruno/user/profile/Update Username.yml
similarity index 100%
rename from bruno-yaml/user/profile/Update Username.yml
rename to bruno/user/profile/Update Username.yml