diff --git a/Cargo.toml b/Cargo.toml
index 0dcce559..410576cd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,6 +25,7 @@ members = [
     "libimagentrylist",
     "libimagentrymarkdown",
     "libimagentrytag",
+    "libimagentrytimetrack",
     "libimagentryview",
     "libimagerror",
     "libimaginteraction",
@@ -33,7 +34,6 @@ members = [
     "libimagref",
     "libimagrt",
     "libimagstore",
-    "libimagtimetrack",
     "libimagtimeui",
     "libimagtodo",
     "libimagutil",
diff --git a/libimagtimetrack/Cargo.toml b/libimagentrytimetrack/Cargo.toml
similarity index 100%
rename from libimagtimetrack/Cargo.toml
rename to libimagentrytimetrack/Cargo.toml
diff --git a/libimagtimetrack/README.md b/libimagentrytimetrack/README.md
similarity index 100%
rename from libimagtimetrack/README.md
rename to libimagentrytimetrack/README.md
diff --git a/libimagtimetrack/src/constants.rs b/libimagentrytimetrack/src/constants.rs
similarity index 100%
rename from libimagtimetrack/src/constants.rs
rename to libimagentrytimetrack/src/constants.rs
diff --git a/libimagtimetrack/src/error.rs b/libimagentrytimetrack/src/error.rs
similarity index 100%
rename from libimagtimetrack/src/error.rs
rename to libimagentrytimetrack/src/error.rs
diff --git a/libimagtimetrack/src/iter/create.rs b/libimagentrytimetrack/src/iter/create.rs
similarity index 100%
rename from libimagtimetrack/src/iter/create.rs
rename to libimagentrytimetrack/src/iter/create.rs
diff --git a/libimagtimetrack/src/iter/get.rs b/libimagentrytimetrack/src/iter/get.rs
similarity index 100%
rename from libimagtimetrack/src/iter/get.rs
rename to libimagentrytimetrack/src/iter/get.rs
diff --git a/libimagtimetrack/src/iter/mod.rs b/libimagentrytimetrack/src/iter/mod.rs
similarity index 100%
rename from libimagtimetrack/src/iter/mod.rs
rename to libimagentrytimetrack/src/iter/mod.rs
diff --git a/libimagtimetrack/src/iter/setendtime.rs b/libimagentrytimetrack/src/iter/setendtime.rs
similarity index 100%
rename from libimagtimetrack/src/iter/setendtime.rs
rename to libimagentrytimetrack/src/iter/setendtime.rs
diff --git a/libimagtimetrack/src/iter/storeid.rs b/libimagentrytimetrack/src/iter/storeid.rs
similarity index 100%
rename from libimagtimetrack/src/iter/storeid.rs
rename to libimagentrytimetrack/src/iter/storeid.rs
diff --git a/libimagtimetrack/src/iter/tag.rs b/libimagentrytimetrack/src/iter/tag.rs
similarity index 100%
rename from libimagtimetrack/src/iter/tag.rs
rename to libimagentrytimetrack/src/iter/tag.rs
diff --git a/libimagtimetrack/src/lib.rs b/libimagentrytimetrack/src/lib.rs
similarity index 96%
rename from libimagtimetrack/src/lib.rs
rename to libimagentrytimetrack/src/lib.rs
index 44b088e9..03346221 100644
--- a/libimagtimetrack/src/lib.rs
+++ b/libimagentrytimetrack/src/lib.rs
@@ -33,8 +33,8 @@ extern crate libimagentrytag;
 
 mod constants;
 pub mod error;
-pub mod event;
-pub mod eventstore;
+pub mod timetracking;
+pub mod timetrackingstore;
 pub mod iter;
 pub mod result;
 pub mod tag;
diff --git a/libimagtimetrack/src/result.rs b/libimagentrytimetrack/src/result.rs
similarity index 100%
rename from libimagtimetrack/src/result.rs
rename to libimagentrytimetrack/src/result.rs
diff --git a/libimagtimetrack/src/tag.rs b/libimagentrytimetrack/src/tag.rs
similarity index 100%
rename from libimagtimetrack/src/tag.rs
rename to libimagentrytimetrack/src/tag.rs
diff --git a/libimagtimetrack/src/event.rs b/libimagentrytimetrack/src/timetracking.rs
similarity index 100%
rename from libimagtimetrack/src/event.rs
rename to libimagentrytimetrack/src/timetracking.rs
diff --git a/libimagtimetrack/src/eventstore.rs b/libimagentrytimetrack/src/timetrackingstore.rs
similarity index 100%
rename from libimagtimetrack/src/eventstore.rs
rename to libimagentrytimetrack/src/timetrackingstore.rs