Merge dev into refactor/server-routes

- Resolved conflict in server.ts by keeping refactored route structure
- Added directory and roots query params to SessionRoutes from dev

Co-authored-by: Leka74 <791494+Leka74@users.noreply.github.com>