1 files changed, 31 insertions, 48 deletions
diff --git a/org/imports.org b/org/imports.org
index 17819b8..05f5dc9 100644
--- a/org/imports.org
+++ b/org/imports.org
@@ -13,82 +13,65 @@
 #+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
 
 * 1. imports for ao
+** package dir
 
-#+NAME: version_txt
-#+BEGIN_SRC d  :tangle ../src/sdp/imports_for_ao.d
-module sdp.imports_for_ao;
-public import
-  sdp.abstraction_summary,
-  sdp.ao_abstract_doc_source,
-  sdp.ao_conf_make_meta,
-  sdp.ao_conf_make_meta_native,
-  sdp.ao_conf_make_meta_sdlang,
-  sdp.ao_defaults,
-  sdp.ao_doc_debugs,
-  sdp.ao_read_config_files,
-  sdp.ao_read_source_files,
-  sdp.ao_rgx,
-  sdp.output_hub,
-  sdp.paths_source;
-/+ sdlang http://sdlang.org +/
-public import sdlang;
-/+ aarchive https://github.com/rcythr/archive +/
+#+BEGIN_SRC d  :tangle ../src/sdp/ao/package.d
+module sdp.ao;
+<<imports_for_ao_general>>
+#+END_SRC
+
+** import list
+
+#+NAME: imports_for_ao_general
+#+BEGIN_SRC d
 public import
-  archive.core,
-  archive.zip;
+  sdp.ao.defaults,
+  sdp.ao.rgx;
 /+ std +/
 public import
-  // std.algorithm,
   std.array,
-  // std.container,
-  std.digest.sha,
   std.exception,
-  std.getopt,
-  std.process,
-  std.stdio,
-  // std.file,
-  // std.path,
   std.range,
-  // std.range,
   std.regex,
+  std.stdio,
   std.string,
   std.traits,
   std.typecons,
-  std.uni,
+  // std.uni,
   std.utf,
   std.conv : to;
 #+END_SRC
 
 * 2. imports for output
 
-#+NAME: version_txt
-#+BEGIN_SRC d  :tangle ../src/sdp/imports_for_output.d
-module sdp.imports_for_output;
+** package dir
+
+#+BEGIN_SRC d  :tangle ../src/sdp/output/package.d
+module sdp.output;
+<<imports_for_output_general>>
+#+END_SRC
+
+** import list
+
+#+NAME: imports_for_output_general
+#+BEGIN_SRC d
 public import
-  std.regex,
   std.algorithm,
   std.array,
   std.container,
   std.exception,
-  std.getopt,
-  std.process,
-  std.stdio,
-  std.file,
   std.path,
+  std.process,
   std.range,
   std.regex,
+  std.stdio,
   std.string,
   std.traits,
   std.typecons,
-  std.uni,
+  // std.uni,
   std.utf;
 public import
-  sdp.defaults,
-  sdp.output_epub3,
-  sdp.output_html,
-  sdp.output_rgx,
-  sdp.output_xmls,
-  sdp.source_sisupod,
-  sdp.create_zip_file,
-  sdp.paths_output;
+  sdp.output.defaults,
+  sdp.output.paths_output,
+  sdp.output.rgx;
 #+END_SRC