diff --git a/sram_spice.py b/sram_spice.py
index c2e35a0..0649b9e 100755
--- a/sram_spice.py
+++ b/sram_spice.py
@@ -4,6 +4,7 @@
 import pathlib
 import os
 
+import common
 from spice import header, change_names
 
 _, src_dir, dst_dir = sys.argv
@@ -13,7 +14,6 @@
     src = a
     dst = a
     s = os.path.join(src_dir, src)
-    d = os.path.join(dst_dir, dst)
     with open(s, "r") as f:
         data = f.read()
 
@@ -22,10 +22,15 @@
 
     ddir, dfile = dst.split('/', 1)
     dbase, dext = dfile.split('.', 1)
+    dbase = common.convert_cell_fullname(dbase)
+    assert '__' in dbase, (dbase, src)
+    ddir = dbase.split('__')[-1]
 
     data = data.replace(sbase, dbase)
     data = change_names("sky130_fd_bd_sram", data)
 
+    d = os.path.join(dst_dir, ddir, f"{dbase}.{dext}")
+
     with open(d, "w") as f:
         f.write(header)
         f.write(data)