Rearrange directories to make sense to Tup

genode/blobsets/blobsets_genode.nimble

@@ -7,9 +7,6 @@ license       = "AGPLv3"
 srcDir        = "src"
 binDir        = "bin"
 bin           = @[
-  #"blobset_fs_store",
-  #"dagfs_server",
-  #"dagfs_tcp_store"
   "blobsets_fs",
   "blobsets_http",
   "blobsets_rom",
@@ -22,4 +19,3 @@ requires "nim >= 0.19.0", "blobsets", "genode"
 
 task genode, "Build for Genode":
   exec "nimble build --os:genode -d:posix"
-

genode/blobsets/src/blobsets_fs.nim

@@ -3,15 +3,14 @@ import std/tables, std/xmltree, std/strtabs, std/strutils, std/streams, std/xmlp
 
 import genode, genode/signals, genode/parents, genode/servers, genode/roms
 
-import ../../src/blobsets, ../../src/blobsets/filestores, ./private/filesystemsession
+import blobsets, blobsets/filestores, ./private/filesystemsession
 
 const
   currentPath = currentSourcePath.rsplit("/", 1)[0]
   fsComponentH = currentPath & "/private/fs_component.h"
 
-const FsH = "<file_system_session/file_system_session.h>"
-
 #[
+const FsH = "<file_system_session/file_system_session.h>"
 
 # Cannot throw C++ exceptions from within Libc::with_libc
 

genode/blobsets/src/blobsets_http.nim

@@ -1,7 +1,7 @@
 import genode
 
 import std/asyncdispatch
-import ../../src/blobsets/filestores, ../../src/blobsets/httpservers
+import blobsets/filestores, blobsets/httpservers
 
 componentConstructHook = proc (env: GenodeEnv) =
   echo "--- Blobsets HTTP server ---"

genode/blobsets/src/blobsets_rom.nim

@@ -1,6 +1,6 @@
 import std/xmltree, std/streams, std/strtabs, std/strutils, std/xmlparser, std/tables
 import genode, genode/parents, genode/servers, genode/roms
-import ../../src/blobsets, ../../src/blobsets/filestores
+import blobsets, blobsets/filestores
 
 const
   currentPath = currentSourcePath.rsplit("/", 1)[0]