diff --git a/src/proc/asset/entry-id.hpp b/src/lib/idi/entry-id.hpp
similarity index 100%
rename from src/proc/asset/entry-id.hpp
rename to src/lib/idi/entry-id.hpp
diff --git a/src/proc/asset/meta.hpp b/src/proc/asset/meta.hpp
index 0af580a18..b7518b0ed 100644
--- a/src/proc/asset/meta.hpp
+++ b/src/proc/asset/meta.hpp
@@ -60,7 +60,7 @@
 #define ASSET_META_H
 
 #include "proc/asset.hpp"
-#include "proc/asset/entry-id.hpp"
+#include "lib/idi/entry-id.hpp"
 
 #include <boost/noncopyable.hpp>
 
diff --git a/src/proc/asset/meta/time-grid.hpp b/src/proc/asset/meta/time-grid.hpp
index d45fe78bc..2cf593edb 100644
--- a/src/proc/asset/meta/time-grid.hpp
+++ b/src/proc/asset/meta/time-grid.hpp
@@ -48,7 +48,7 @@
 #define ASSET_META_TIME_GRID_H
 
 #include "proc/asset/meta.hpp"
-#include "proc/asset/entry-id.hpp"
+#include "lib/idi/entry-id.hpp"
 #include "lib/time/grid.hpp"
 #include "lib/time/timevalue.hpp"
 #include "lib/symbol.hpp"
diff --git a/src/proc/asset/struct-scheme.hpp b/src/proc/asset/struct-scheme.hpp
index ed2184cb8..350f1d090 100644
--- a/src/proc/asset/struct-scheme.hpp
+++ b/src/proc/asset/struct-scheme.hpp
@@ -38,7 +38,7 @@
 
 #include "lib/symbol.hpp"
 #include "proc/asset.hpp"
-#include "proc/asset/entry-id.hpp"
+#include "lib/idi/entry-id.hpp"
 
 #include <cstdlib>
 
diff --git a/src/proc/mobject/session/fork.hpp b/src/proc/mobject/session/fork.hpp
index aeff9b1f8..31eec9444 100644
--- a/src/proc/mobject/session/fork.hpp
+++ b/src/proc/mobject/session/fork.hpp
@@ -25,7 +25,7 @@
 #define MOBJECT_SESSION_FORK_H
 
 #include "proc/mobject/session/meta.hpp"
-#include "proc/asset/entry-id.hpp"
+#include "lib/idi/entry-id.hpp"
 #include "lib/time/timevalue.hpp"
 
 
diff --git a/src/proc/mobject/session/mobjectfactory.hpp b/src/proc/mobject/session/mobjectfactory.hpp
index a207dd7f9..86a50b6f4 100644
--- a/src/proc/mobject/session/mobjectfactory.hpp
+++ b/src/proc/mobject/session/mobjectfactory.hpp
@@ -25,7 +25,7 @@
 #define PROC_MOBJECT_SESSION_MOBJECTFACTORY_H
 
 #include "proc/mobject/mobject.hpp"
-#include "proc/asset/entry-id.hpp"
+#include "lib/idi/entry-id.hpp"
 #include "lib/symbol.hpp"
 
 
diff --git a/src/proc/streamtype.hpp b/src/proc/streamtype.hpp
index 195e502b9..e357bd694 100644
--- a/src/proc/streamtype.hpp
+++ b/src/proc/streamtype.hpp
@@ -37,7 +37,7 @@
 
 #include "lib/symbol.hpp"
 //#include "common/query.hpp"
-#include "proc/asset/entry-id.hpp"
+#include "lib/idi/entry-id.hpp"
 
 #include <boost/noncopyable.hpp>
 
diff --git a/tests/core/proc/asset/typed-id-test.cpp b/tests/core/proc/asset/typed-id-test.cpp
index 09ed647cd..65e54cdc8 100644
--- a/tests/core/proc/asset/typed-id-test.cpp
+++ b/tests/core/proc/asset/typed-id-test.cpp
@@ -25,7 +25,7 @@
 #include "lib/test/test-helper.hpp"
 
 #include "proc/asset/typed-id.hpp"
-#include "proc/asset/entry-id.hpp"
+#include "lib/idi/entry-id.hpp"
 #include "lib/p.hpp"
 #include "proc/assetmanager.hpp"
 #include "proc/asset/inventory.hpp"
diff --git a/tests/core/proc/asset/entry-id-test.cpp b/tests/library/entry-id-test.cpp
similarity index 99%
rename from tests/core/proc/asset/entry-id-test.cpp
rename to tests/library/entry-id-test.cpp
index a144ed23c..c846b0744 100644
--- a/tests/core/proc/asset/entry-id-test.cpp
+++ b/tests/library/entry-id-test.cpp
@@ -24,7 +24,7 @@
 #include "lib/test/run.hpp"
 #include "lib/test/test-helper.hpp"
 
-#include "proc/asset/entry-id.hpp"
+#include "lib/idi/entry-id.hpp"
 #include "proc/asset/struct-scheme.hpp"
 #include "proc/mobject/session/clip.hpp"
 #include "proc/mobject/session/fork.hpp"
@@ -293,7 +293,7 @@ namespace test{
   
   
   /** Register this test class... */
-  LAUNCHER (EntryID_test, "unit asset");
+  LAUNCHER (EntryID_test, "unit common");
   
   
 }}} // namespace lib::idi::test