summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2017-08-13 21:48:17 +0000
committerMatthias Beyer <mail@beyermatthias.de>2017-08-27 15:12:09 +0200
commit59a3662ac47b0c657781bd1db34bbf9a5a692326 (patch)
tree709f72c44c8d978a5a76abb9036c6f08744a4aa2
parent31254071e5a4bf2f5db9067c5cdb22c25579ac67 (diff)
downloadimag-59a3662ac47b0c657781bd1db34bbf9a5a692326.tar.gz
imag-59a3662ac47b0c657781bd1db34bbf9a5a692326.tar.xz
-rw-r--r--.imag-documentation/Cargo.toml49
-rw-r--r--Cargo.toml74
-rw-r--r--bin/core/imag-link/Cargo.toml (renamed from imag-link/Cargo.toml)12
l---------bin/core/imag-link/README.md (renamed from imag-link/README.md)0
-rw-r--r--bin/core/imag-link/src/main.rs (renamed from imag-link/src/main.rs)0
-rw-r--r--bin/core/imag-link/src/ui.rs (renamed from imag-link/src/ui.rs)0
-rw-r--r--bin/core/imag-ref/Cargo.toml29
l---------bin/core/imag-ref/README.md (renamed from imag-ref/README.md)0
-rw-r--r--bin/core/imag-ref/src/main.rs (renamed from imag-ref/src/main.rs)0
-rw-r--r--bin/core/imag-ref/src/ui.rs (renamed from imag-ref/src/ui.rs)0
-rw-r--r--bin/core/imag-store/Cargo.toml (renamed from imag-store/Cargo.toml)8
l---------bin/core/imag-store/README.md (renamed from imag-store/README.md)0
-rw-r--r--bin/core/imag-store/src/create.rs (renamed from imag-store/src/create.rs)0
-rw-r--r--bin/core/imag-store/src/delete.rs (renamed from imag-store/src/delete.rs)0
-rw-r--r--bin/core/imag-store/src/dump.rs (renamed from imag-store/src/dump.rs)0
-rw-r--r--bin/core/imag-store/src/error.rs (renamed from imag-store/src/error.rs)0
-rw-r--r--bin/core/imag-store/src/get.rs (renamed from imag-store/src/get.rs)0
-rw-r--r--bin/core/imag-store/src/main.rs (renamed from imag-store/src/main.rs)0
-rw-r--r--bin/core/imag-store/src/retrieve.rs (renamed from imag-store/src/retrieve.rs)0
-rw-r--r--bin/core/imag-store/src/ui.rs (renamed from imag-store/src/ui.rs)0
-rw-r--r--bin/core/imag-store/src/update.rs (renamed from imag-store/src/update.rs)0
-rw-r--r--bin/core/imag-store/src/util.rs (renamed from imag-store/src/util.rs)0
-rw-r--r--bin/core/imag-store/src/verify.rs (renamed from imag-store/src/verify.rs)0
-rw-r--r--bin/core/imag-store/tests/001-create_test.sh (renamed from imag-store/tests/001-create_test.sh)0
-rw-r--r--bin/core/imag-store/tests/002-retrieve_test.sh (renamed from imag-store/tests/002-retrieve_test.sh)0
-rw-r--r--bin/core/imag-store/tests/003-delete_test.sh (renamed from imag-store/tests/003-delete_test.sh)0
-rw-r--r--bin/core/imag-store/tests/Makefile (renamed from imag-store/tests/Makefile)0
-rw-r--r--bin/core/imag-store/tests/utils.sh (renamed from imag-store/tests/utils.sh)0
-rw-r--r--bin/core/imag-tag/Cargo.toml (renamed from imag-tag/Cargo.toml)12
l---------bin/core/imag-tag/README.md (renamed from imag-tag/README.md)0
-rw-r--r--bin/core/imag-tag/src/main.rs (renamed from imag-tag/src/main.rs)0
-rw-r--r--bin/core/imag-tag/src/ui.rs (renamed from imag-tag/src/ui.rs)0
-rw-r--r--bin/core/imag-view/Cargo.toml (renamed from imag-view/Cargo.toml)9
l---------bin/core/imag-view/README.md (renamed from imag-view/README.md)0
-rw-r--r--bin/core/imag-view/src/editor.rs (renamed from imag-view/src/editor.rs)0
-rw-r--r--bin/core/imag-view/src/main.rs (renamed from imag-view/src/main.rs)0
-rw-r--r--bin/core/imag-view/src/ui.rs (renamed from imag-view/src/ui.rs)0
-rw-r--r--bin/core/imag/Cargo.toml (renamed from bin/Cargo.toml)11
-rw-r--r--bin/core/imag/src/main.rs (renamed from bin/src/main.rs)0
-rw-r--r--bin/domain/imag-bookmark/Cargo.toml (renamed from imag-bookmark/Cargo.toml)12
l---------bin/domain/imag-bookmark/README.md (renamed from imag-bookmark/README.md)0
-rw-r--r--bin/domain/imag-bookmark/src/main.rs (renamed from imag-bookmark/src/main.rs)0
-rw-r--r--bin/domain/imag-bookmark/src/ui.rs (renamed from imag-bookmark/src/ui.rs)0
-rw-r--r--bin/domain/imag-counter/Cargo.toml (renamed from imag-counter/Cargo.toml)9
l---------bin/domain/imag-counter/README.md (renamed from imag-counter/README.md)0
-rw-r--r--bin/domain/imag-counter/src/create.rs (renamed from imag-counter/src/create.rs)0
-rw-r--r--bin/domain/imag-counter/src/delete.rs (renamed from imag-counter/src/delete.rs)0
-rw-r--r--bin/domain/imag-counter/src/interactive.rs (renamed from imag-counter/src/interactive.rs)0
-rw-r--r--bin/domain/imag-counter/src/list.rs (renamed from imag-counter/src/list.rs)0
-rw-r--r--bin/domain/imag-counter/src/main.rs (renamed from imag-counter/src/main.rs)0
-rw-r--r--bin/domain/imag-counter/src/ui.rs (renamed from imag-counter/src/ui.rs)0
-rw-r--r--bin/domain/imag-diary/Cargo.toml31
l---------bin/domain/imag-diary/README.md (renamed from imag-diary/README.md)0
-rw-r--r--bin/domain/imag-diary/src/create.rs (renamed from imag-diary/src/create.rs)0
-rw-r--r--bin/domain/imag-diary/src/delete.rs (renamed from imag-diary/src/delete.rs)0
-rw-r--r--bin/domain/imag-diary/src/edit.rs (renamed from imag-diary/src/edit.rs)0
-rw-r--r--bin/domain/imag-diary/src/list.rs (renamed from imag-diary/src/list.rs)0
-rw-r--r--bin/domain/imag-diary/src/main.rs (renamed from imag-diary/src/main.rs)0
-rw-r--r--bin/domain/imag-diary/src/ui.rs (renamed from imag-diary/src/ui.rs)0
-rw-r--r--bin/domain/imag-diary/src/util.rs (renamed from imag-diary/src/util.rs)0
-rw-r--r--bin/domain/imag-diary/src/view.rs (renamed from imag-diary/src/view.rs)0
-rw-r--r--bin/domain/imag-mail/Cargo.toml (renamed from imag-mail/Cargo.toml)11
l---------bin/domain/imag-mail/README.md (renamed from imag-mail/README.md)0
-rw-r--r--bin/domain/imag-mail/src/main.rs (renamed from imag-mail/src/main.rs)0
-rw-r--r--bin/domain/imag-mail/src/ui.rs (renamed from imag-mail/src/ui.rs)0
-rw-r--r--bin/domain/imag-notes/Cargo.toml (renamed from imag-notes/Cargo.toml)12
-rw-r--r--bin/domain/imag-notes/src/main.rs (renamed from imag-notes/src/main.rs)0
-rw-r--r--bin/domain/imag-notes/src/ui.rs (renamed from imag-notes/src/ui.rs)0
-rw-r--r--bin/domain/imag-timetrack/Cargo.toml (renamed from imag-timetrack/Cargo.toml)10
-rw-r--r--bin/domain/imag-timetrack/src/cont.rs (renamed from imag-timetrack/src/cont.rs)0
-rw-r--r--bin/domain/imag-timetrack/src/day.rs (renamed from imag-timetrack/src/day.rs)0
-rw-r--r--bin/domain/imag-timetrack/src/list.rs (renamed from imag-timetrack/src/list.rs)0
-rw-r--r--bin/domain/imag-timetrack/src/main.rs (renamed from imag-timetrack/src/main.rs)0
-rw-r--r--bin/domain/imag-timetrack/src/month.rs (renamed from imag-timetrack/src/month.rs)0
-rw-r--r--bin/domain/imag-timetrack/src/start.rs (renamed from imag-timetrack/src/start.rs)0
-rw-r--r--bin/domain/imag-timetrack/src/stop.rs (renamed from imag-timetrack/src/stop.rs)0
-rw-r--r--bin/domain/imag-timetrack/src/track.rs (renamed from imag-timetrack/src/track.rs)0
-rw-r--r--bin/domain/imag-timetrack/src/ui.rs (renamed from imag-timetrack/src/ui.rs)0
-rw-r--r--bin/domain/imag-timetrack/src/week.rs (renamed from imag-timetrack/src/week.rs)0
-rw-r--r--bin/domain/imag-timetrack/src/year.rs (renamed from imag-timetrack/src/year.rs)0
-rw-r--r--bin/domain/imag-todo/Cargo.toml (renamed from imag-todo/Cargo.toml)8
-rw-r--r--bin/domain/imag-todo/etc/on-add.sh (renamed from imag-todo/etc/on-add.sh)0
-rw-r--r--bin/domain/imag-todo/etc/on-modify.sh (renamed from imag-todo/etc/on-modify.sh)0
-rw-r--r--bin/domain/imag-todo/src/main.rs (renamed from imag-todo/src/main.rs)0
-rw-r--r--bin/domain/imag-todo/src/ui.rs (renamed from imag-todo/src/ui.rs)0
-rw-r--r--imag-diary/Cargo.toml30
-rw-r--r--imag-ref/Cargo.toml28
-rw-r--r--lib/core/libimagerror/Cargo.toml (renamed from libimagerror/Cargo.toml)0
l---------lib/core/libimagerror/README.md (renamed from libimagerror/README.md)0
-rw-r--r--lib/core/libimagerror/src/error_gen.rs (renamed from libimagerror/src/error_gen.rs)0
-rw-r--r--lib/core/libimagerror/src/into.rs (renamed from libimagerror/src/into.rs)0
-rw-r--r--lib/core/libimagerror/src/iter.rs (renamed from libimagerror/src/iter.rs)0
-rw-r--r--lib/core/libimagerror/src/lib.rs (renamed from libimagerror/src/lib.rs)0
-rw-r--r--lib/core/libimagerror/src/trace.rs (renamed from libimagerror/src/trace.rs)0
-rw-r--r--lib/core/libimagrt/.gitignore (renamed from libimagrt/.gitignore)0
-rw-r--r--lib/core/libimagrt/Cargo.toml (renamed from libimagrt/Cargo.toml)6
l---------lib/core/libimagrt/README.md (renamed from libimagrt/README.md)0
-rw-r--r--lib/core/libimagrt/src/configuration.rs (renamed from libimagrt/src/configuration.rs)0
-rw-r--r--lib/core/libimagrt/src/error.rs (renamed from libimagrt/src/error.rs)0
-rw-r--r--lib/core/libimagrt/src/lib.rs (renamed from libimagrt/src/lib.rs)0
-rw-r--r--lib/core/libimagrt/src/logger.rs (renamed from libimagrt/src/logger.rs)0
-rw-r--r--lib/core/libimagrt/src/runtime.rs (renamed from libimagrt/src/runtime.rs)0
-rw-r--r--lib/core/libimagrt/src/setup.rs (renamed from libimagrt/src/setup.rs)0
-rw-r--r--lib/core/libimagrt/src/spec.rs (renamed from libimagrt/src/spec.rs)0
-rw-r--r--lib/core/libimagstore/.gitignore (renamed from libimagstore/.gitignore)0
-rw-r--r--lib/core/libimagstore/Cargo.toml (renamed from libimagstore/Cargo.toml)4
l---------lib/core/libimagstore/README.md (renamed from libimagstore/README.md)0
-rw-r--r--lib/core/libimagstore/src/configuration.rs (renamed from libimagstore/src/configuration.rs)0
-rw-r--r--lib/core/libimagstore/src/error.rs (renamed from libimagstore/src/error.rs)0
-rw-r--r--lib/core/libimagstore/src/file_abstraction/fs.rs (renamed from libimagstore/src/file_abstraction/fs.rs)0
-rw-r--r--lib/core/libimagstore/src/file_abstraction/inmemory.rs (renamed from libimagstore/src/file_abstraction/inmemory.rs)0
-rw-r--r--lib/core/libimagstore/src/file_abstraction/mod.rs (renamed from libimagstore/src/file_abstraction/mod.rs)0
-rw-r--r--lib/core/libimagstore/src/file_abstraction/stdio/mapper/json.rs (renamed from libimagstore/src/file_abstraction/stdio/mapper/json.rs)0
-rw-r--r--lib/core/libimagstore/src/file_abstraction/stdio/mapper/mod.rs (renamed from libimagstore/src/file_abstraction/stdio/mapper/mod.rs)0
-rw-r--r--lib/core/libimagstore/src/file_abstraction/stdio/mod.rs (renamed from libimagstore/src/file_abstraction/stdio/mod.rs)0
-rw-r--r--lib/core/libimagstore/src/file_abstraction/stdio/out.rs (renamed from libimagstore/src/file_abstraction/stdio/out.rs)0
-rw-r--r--lib/core/libimagstore/src/lib.rs (renamed from libimagstore/src/lib.rs)0
-rw-r--r--lib/core/libimagstore/src/store.rs (renamed from libimagstore/src/store.rs)0
-rw-r--r--lib/core/libimagstore/src/storeid.rs (renamed from libimagstore/src/storeid.rs)0
-rw-r--r--lib/core/libimagstore/src/toml_ext.rs (renamed from libimagstore/src/toml_ext.rs)0
-rw-r--r--lib/core/libimagstore/src/util.rs (renamed from libimagstore/src/util.rs)0
-rw-r--r--lib/domain/libimagbookmark/Cargo.toml (renamed from libimagbookmark/Cargo.toml)6
l---------lib/domain/libimagbookmark/README.md (renamed from libimagbookmark/README.md)0
-rw-r--r--lib/domain/libimagbookmark/src/collection.rs (renamed from libimagbookmark/src/collection.rs)0
-rw-r--r--lib/domain/libimagbookmark/src/error.rs (renamed from libimagbookmark/src/error.rs)0
-rw-r--r--lib/domain/libimagbookmark/src/lib.rs (renamed from libimagbookmark/src/lib.rs)0
-rw-r--r--lib/domain/libimagbookmark/src/link.rs (renamed from libimagbookmark/src/link.rs)0
-rw-r--r--lib/domain/libimagbookmark/src/result.rs (renamed from libimagbookmark/src/result.rs)0
-rw-r--r--lib/domain/libimagcounter/Cargo.toml (renamed from libimagcounter/Cargo.toml)4
l---------lib/domain/libimagcounter/README.md (renamed from libimagcounter/README.md)0
-rw-r--r--lib/domain/libimagcounter/src/counter.rs (renamed from libimagcounter/src/counter.rs)0
-rw-r--r--lib/domain/libimagcounter/src/error.rs (renamed from libimagcounter/src/error.rs)0
-rw-r--r--lib/domain/libimagcounter/src/lib.rs (renamed from libimagcounter/src/lib.rs)0
-rw-r--r--lib/domain/libimagcounter/src/result.rs (renamed from libimagcounter/src/result.rs)0
-rw-r--r--lib/domain/libimagdiary/Cargo.toml (renamed from libimagdiary/Cargo.toml)12
l---------lib/domain/libimagdiary/README.md (renamed from libimagdiary/README.md)0
-rw-r--r--lib/domain/libimagdiary/src/config.rs (renamed from libimagdiary/src/config.rs)0
-rw-r--r--lib/domain/libimagdiary/src/diary.rs (renamed from libimagdiary/src/diary.rs)0
-rw-r--r--lib/domain/libimagdiary/src/diaryid.rs (renamed from libimagdiary/src/diaryid.rs)0
-rw-r--r--lib/domain/libimagdiary/src/entry.rs (renamed from libimagdiary/src/entry.rs)0
-rw-r--r--lib/domain/libimagdiary/src/error.rs (renamed from libimagdiary/src/error.rs)0
-rw-r--r--lib/domain/libimagdiary/src/is_in_diary.rs (renamed from libimagdiary/src/is_in_diary.rs)0
-rw-r--r--lib/domain/libimagdiary/src/iter.rs (renamed from libimagdiary/src/iter.rs)0
-rw-r--r--lib/domain/libimagdiary/src/lib.rs (renamed from libimagdiary/src/lib.rs)0
-rw-r--r--lib/domain/libimagdiary/src/result.rs (renamed from libimagdiary/src/result.rs)0
-rw-r--r--lib/domain/libimagdiary/src/viewer.rs (renamed from libimagdiary/src/viewer.rs)0
-rw-r--r--lib/domain/libimagmail/Cargo.toml (renamed from libimagmail/Cargo.toml)6
l---------lib/domain/libimagmail/README.md (renamed from libimagmail/README.md)0
-rw-r--r--lib/domain/libimagmail/src/error.rs (renamed from libimagmail/src/error.rs)0
-rw-r--r--lib/domain/libimagmail/src/hasher.rs (renamed from libimagmail/src/hasher.rs)0
-rw-r--r--lib/domain/libimagmail/src/iter.rs (renamed from libimagmail/src/iter.rs)0
-rw-r--r--lib/domain/libimagmail/src/lib.rs (renamed from libimagmail/src/lib.rs)0
-rw-r--r--lib/domain/libimagmail/src/mail.rs (renamed from libimagmail/src/mail.rs)0
-rw-r--r--lib/domain/libimagmail/src/result.rs (renamed from libimagmail/src/result.rs)0
-rw-r--r--lib/domain/libimagnotes/Cargo.toml (renamed from libimagnotes/Cargo.toml)10
-rw-r--r--lib/domain/libimagnotes/src/error.rs (renamed from libimagnotes/src/error.rs)0
-rw-r--r--lib/domain/libimagnotes/src/lib.rs (renamed from libimagnotes/src/lib.rs)0
-rw-r--r--lib/domain/libimagnotes/src/note.rs (renamed from libimagnotes/src/note.rs)0
-rw-r--r--lib/domain/libimagnotes/src/result.rs (renamed from libimagnotes/src/result.rs)0
-rw-r--r--lib/domain/libimagtodo/Cargo.toml (renamed from libimagtodo/Cargo.toml)6
-rw-r--r--lib/domain/libimagtodo/src/error.rs (renamed from libimagtodo/src/error.rs)0
-rw-r--r--lib/domain/libimagtodo/src/lib.rs (renamed from libimagtodo/src/lib.rs)0
-rw-r--r--lib/domain/libimagtodo/src/result.rs (renamed from libimagtodo/src/result.rs)0
-rw-r--r--lib/domain/libimagtodo/src/task.rs (renamed from libimagtodo/src/task.rs)0
-rw-r--r--lib/entry/libimagentryannotation/Cargo.toml21
l---------lib/entry/libimagentryannotation/README.md (renamed from libimagannotation/README.md)0
-rw-r--r--lib/entry/libimagentryannotation/src/annotateable.rs (renamed from libimagannotation/src/annotateable.rs)0
-rw-r--r--lib/entry/libimagentryannotation/src/annotation_fetcher.rs (renamed from libimagannotation/src/annotation_fetcher.rs)0
-rw-r--r--lib/entry/libimagentryannotation/src/error.rs (renamed from libimagannotation/src/error.rs)0
-rw-r--r--lib/entry/libimagentryannotation/src/lib.rs (renamed from libimagannotation/src/lib.rs)0
-rw-r--r--lib/entry/libimagentryannotation/src/result.rs (renamed from libimagannotation/src/result.rs)0
-rw-r--r--lib/entry/libimagentrycategory/Cargo.toml (renamed from libimagentrycategory/Cargo.toml)4
-rw-r--r--lib/entry/libimagentrycategory/src/category.rs (renamed from libimagentrycategory/src/category.rs)0
-rw-r--r--lib/entry/libimagentrycategory/src/error.rs (renamed from libimagentrycategory/src/error.rs)0
-rw-r--r--lib/entry/libimagentrycategory/src/lib.rs (renamed from libimagentrycategory/src/lib.rs)0
-rw-r--r--lib/entry/libimagentrycategory/src/register.rs (renamed from libimagentrycategory/src/register.rs)0
-rw-r--r--lib/entry/libimagentrycategory/src/result.rs (renamed from libimagentrycategory/src/result.rs)0
-rw-r--r--lib/entry/libimagentrydatetime/Cargo.toml (renamed from libimagentrydatetime/Cargo.toml)6
-rw-r--r--lib/entry/libimagentrydatetime/src/datepath/accuracy.rs (renamed from libimagentrydatetime/src/datepath/accuracy.rs)0
-rw-r--r--lib/entry/libimagentrydatetime/src/datepath/compiler.rs (renamed from libimagentrydatetime/src/datepath/compiler.rs)0
-rw-r--r--lib/entry/libimagentrydatetime/src/datepath/error.rs (renamed from libimagentrydatetime/src/datepath/error.rs)0
-rw-r--r--lib/entry/libimagentrydatetime/src/datepath/format.rs (renamed from libimagentrydatetime/src/datepath/format.rs)0
-rw-r--r--lib/entry/libimagentrydatetime/src/datepath/mod.rs (renamed from libimagentrydatetime/src/datepath/mod.rs)0
-rw-r--r--lib/entry/libimagentrydatetime/src/datepath/result.rs (renamed from libimagentrydatetime/src/datepath/result.rs)0
-rw-r--r--lib/entry/libimagentrydatetime/src/datepath/to_store_id.rs (renamed from libimagentrydatetime/src/datepath/to_store_id.rs)0
-rw-r--r--lib/entry/libimagentrydatetime/src/datetime.rs (renamed from libimagentrydatetime/src/datetime.rs)0
-rw-r--r--lib/entry/libimagentrydatetime/src/error.rs (renamed from libimagentrydatetime/src/error.rs)0
-rw-r--r--lib/entry/libimagentrydatetime/src/lib.rs (renamed from libimagentrydatetime/src/lib.rs)0
-rw-r--r--lib/entry/libimagentrydatetime/src/range.rs (renamed from libimagentrydatetime/src/range.rs)0
-rw-r--r--lib/entry/libimagentrydatetime/src/result.rs (renamed from libimagentrydatetime/src/result.rs)0
-rw-r--r--lib/entry/libimagentryedit/Cargo.toml (renamed from libimagentryedit/Cargo.toml)8
-rw-r--r--lib/entry/libimagentryedit/src/edit.rs (renamed from libimagentryedit/src/edit.rs)0
-rw-r--r--lib/entry/libimagentryedit/src/error.rs (renamed from libimagentryedit/src/error.rs)0
-rw-r--r--lib/entry/libimagentryedit/src/lib.rs (renamed from libimagentryedit/src/lib.rs)0
-rw-r--r--lib/entry/libimagentryedit/src/result.rs (renamed from libimagentryedit/src/result.rs)0
-rw-r--r--lib/entry/libimagentryfilter/Cargo.toml (renamed from libimagentryfilter/Cargo.toml)4
l---------lib/entry/libimagentryfilter/README.md (renamed from libimagentryfilter/README.md)0
-rw-r--r--lib/entry/libimagentryfilter/src/builtin/bool_filter.rs (renamed from libimagentryfilter/src/builtin/bool_filter.rs)0
-rw-r--r--lib/entry/libimagentryfilter/src/builtin/content/grep.rs (renamed from libimagentryfilter/src/builtin/content/grep.rs)0
-rw-r--r--lib/entry/libimagentryfilter/src/builtin/content/length/is_over.rs (renamed from libimagentryfilter/src/builtin/content/length/is_over.rs)0
-rw-r--r--lib/entry/libimagentryfilter/src/builtin/content/length/is_under.rs (renamed from libimagentryfilter/src/builtin/content/length/is_under.rs)0
-rw-r--r--lib/entry/libimagentryfilter/src/builtin/content/length/mod.rs (renamed from libimagentryfilter/src/builtin/content/length/mod.rs)0
-rw-r--r--lib/entry/libimagentryfilter/src/builtin/content/mod.rs (renamed from libimagentryfilter/src/builtin/content/mod.rs)0
-rw-r--r--lib/entry/libimagentryfilter/src/builtin/header/field_eq.rs (renamed from libimagentryfilter/src/builtin/header/field_eq.rs)0
-rw-r--r--lib/entry/libimagentryfilter/src/builtin/header/field_exists.rs (renamed from libimagentryfilter/src/builtin/header/field_exists.rs)0
-rw-r--r--lib/entry/libimagentryfilter/src/builtin/header/field_grep.rs (renamed from libimagentryfilter/src/builtin/header/field_grep.rs)0
-rw-r--r--lib/entry/libimagentryfilter/src/builtin/header/field_gt.rs (renamed from libimagentryfilter/src/builtin/header/field_gt.rs)0
-rw-r--r--lib/entry/libimagentryfilter/src/builtin/header/field_isempty.rs (renamed from libimagentryfilter/src/builtin/header/field_isempty.rs)0
-rw-r--r--lib/entry/libimagentryfilter/src/builtin/header/field_istype.rs (renamed from libimagentryfilter/src/builtin/header/field_istype.rs)0
-rw-r--r--lib/entry/libimagentryfilter/src/builtin/header/field_lt.rs (renamed from libimagentryfilter/src/builtin/header/field_lt.rs)0
-rw-r--r--lib/entry/libimagentryfilter/src/builtin/header/field_path.rs (renamed from libimagentryfilter/src/builtin/header/field_path.rs)0
-rw-r--r--lib/entry/libimagentryfilter/src/builtin/header/field_predicate.rs (renamed from libimagentryfilter/src/builtin/header/field_predicate.rs)0
-rw-r--r--lib/entry/libimagentryfilter/src/builtin/header/mod.rs (renamed from libimagentryfilter/src/builtin/header/mod.rs)0
-rw-r--r--lib/entry/libimagentryfilter/src/builtin/header/version/eq.rs (renamed from libimagentryfilter/src/builtin/header/version/eq.rs)0
-rw-r--r--lib/entry/libimagentryfilter/src/builtin/header/version/gt.rs (renamed from libimagentryfilter/src/builtin/header/version/gt.rs)0
-rw-r--r--lib/entry/libimagentryfilter/src/builtin/header/version/lt.rs (renamed from libimagentryfilter/src/builtin/header/version/lt.rs)0
-rw-r--r--lib/entry/libimagentryfilter/src/builtin/header/version/mod.rs (renamed from libimagentryfilter/src/builtin/header/version/mod.rs)0
-rw-r--r--lib/entry/libimagentryfilter/src/builtin/header/version/range.rs (renamed from libimagentryfilter/src/builtin/header/version/range.rs)0
-rw-r--r--lib/entry/libimagentryfilter/src/builtin/mod.rs (renamed from libimagentryfilter/src/builtin/mod.rs)0
-rw-r--r--lib/entry/libimagentryfilter/src/cli.rs (renamed from libimagentryfilter/src/cli.rs)0
-rw-r--r--lib/entry/libimagentryfilter/src/lib.rs (renamed from libimagentryfilter/src/lib.rs)0
-rw-r--r--lib/entry/libimagentryfilter/src/tags/mod.rs (renamed from libimagentryfilter/src/tags/mod.rs)0
-rw-r--r--lib/entry/libimagentrylink/Cargo.toml (renamed from libimagentrylink/Cargo.toml)6
l---------lib/entry/libimagentrylink/README.md (renamed from libimagentrylink/README.md)0
-rw-r--r--lib/entry/libimagentrylink/src/error.rs (renamed from libimagentrylink/src/error.rs)0
-rw-r--r--lib/entry/libimagentrylink/src/external.rs (renamed from libimagentrylink/src/external.rs)0
-rw-r--r--lib/entry/libimagentrylink/src/internal.rs (renamed from libimagentrylink/src/internal.rs)0
-rw-r--r--lib/entry/libimagentrylink/src/lib.rs (renamed from libimagentrylink/src/lib.rs)0
-rw-r--r--lib/entry/libimagentrylink/src/result.rs (renamed from libimagentrylink/src/result.rs)0
-rw-r--r--lib/entry/libimagentrylist/Cargo.toml (renamed from libimagentrylist/Cargo.toml)6
l---------lib/entry/libimagentrylist/README.md (renamed from libimagentrylist/README.md)0
-rw-r--r--lib/entry/libimagentrylist/src/cli.rs (renamed from libimagentrylist/src/cli.rs)0
-rw-r--r--lib/entry/libimagentrylist/src/error.rs (renamed from libimagentrylist/src/error.rs)0
-rw-r--r--lib/entry/libimagentrylist/src/lib.rs (renamed from libimagentrylist/src/lib.rs)0
-rw-r--r--lib/entry/libimagentrylist/src/lister.rs (renamed from libimagentrylist/src/lister.rs)0
-rw-r--r--lib/entry/libimagentrylist/src/listers/core.rs (renamed from libimagentrylist/src/listers/core.rs)0
-rw-r--r--lib/entry/libimagentrylist/src/listers/line.rs (renamed from libimagentrylist/src/listers/line.rs)0
-rw-r--r--lib/entry/libimagentrylist/src/listers/mod.rs (renamed from libimagentrylist/src/listers/mod.rs)0
-rw-r--r--lib/entry/libimagentrylist/src/listers/path.rs (renamed from libimagentrylist/src/listers/path.rs)0
-rw-r--r--lib/entry/libimagentrylist/src/listers/table.rs (renamed from libimagentrylist/src/listers/table.rs)0
-rw-r--r--lib/entry/libimagentrylist/src/result.rs (renamed from libimagentrylist/src/result.rs)0
-rw-r--r--lib/entry/libimagentrymarkdown/Cargo.toml (renamed from libimagentrymarkdown/Cargo.toml)4
l---------lib/entry/libimagentrymarkdown/README.md (renamed from libimagentrymarkdown/README.md)0
-rw-r--r--lib/entry/libimagentrymarkdown/src/error.rs (renamed from libimagentrymarkdown/src/error.rs)0
-rw-r--r--lib/entry/libimagentrymarkdown/src/html.rs (renamed from libimagentrymarkdown/src/html.rs)0
-rw-r--r--lib/entry/libimagentrymarkdown/src/lib.rs (renamed from libimagentrymarkdown/src/lib.rs)0
-rw-r--r--lib/entry/libimagentrymarkdown/src/link.rs (renamed from libimagentrymarkdown/src/link.rs)0
-rw-r--r--lib/entry/libimagentrymarkdown/src/result.rs (renamed from libimagentrymarkdown/src/result.rs)0
-rw-r--r--lib/entry/libimagentryref/Cargo.toml (renamed from libimagref/Cargo.toml)10
l---------lib/entry/libimagentryref/README.md (renamed from libimagref/README.md)0
-rw-r--r--lib/entry/libimagentryref/src/error.rs (renamed from libimagref/src/error.rs)0
-rw-r--r--lib/entry/libimagentryref/src/flags.rs (renamed from libimagref/src/flags.rs)0
-rw-r--r--lib/entry/libimagentryref/src/hasher.rs (renamed from libimagref/src/hasher.rs)0
-rw-r--r--lib/entry/libimagentryref/src/hashers/mod.rs (renamed from libimagref/src/hashers/mod.rs)0
-rw-r--r--lib/entry/libimagentryref/src/hashers/nbytes.rs (renamed from libimagref/src/hashers/nbytes.rs)0
-rw-r--r--lib/entry/libimagentryref/src/lib.rs (renamed from libimagref/src/lib.rs)0
-rw-r--r--lib/entry/libimagentryref/src/lister.rs (renamed from libimagref/src/lister.rs)0
-rw-r--r--lib/entry/libimagentryref/src/reference.rs (renamed from libimagref/src/reference.rs)0
-rw-r--r--lib/entry/libimagentryref/src/result.rs (renamed from libimagref/src/result.rs)0
-rw-r--r--lib/entry/libimagentrytag/Cargo.toml (renamed from libimagentrytag/Cargo.toml)6
l---------lib/entry/libimagentrytag/README.md (renamed from libimagentrytag/README.md)0
-rw-r--r--lib/entry/libimagentrytag/src/error.rs (renamed from libimagentrytag/src/error.rs)0
-rw-r--r--lib/entry/libimagentrytag/src/exec.rs (renamed from libimagentrytag/src/exec.rs)0
-rw-r--r--lib/entry/libimagentrytag/src/lib.rs (renamed from libimagentrytag/src/lib.rs)0
-rw-r--r--lib/entry/libimagentrytag/src/result.rs (renamed from libimagentrytag/src/result.rs)0
-rw-r--r--lib/entry/libimagentrytag/src/tag.rs (renamed from libimagentrytag/src/tag.rs)0
-rw-r--r--lib/entry/libimagentrytag/src/tagable.rs (renamed from libimagentrytag/src/tagable.rs)0
-rw-r--r--lib/entry/libimagentrytag/src/ui.rs (renamed from libimagentrytag/src/ui.rs)0
-rw-r--r--lib/entry/libimagentrytimetrack/Cargo.toml (renamed from libimagentrytimetrack/Cargo.toml)8
l---------lib/entry/libimagentrytimetrack/README.md (renamed from libimagentrytimetrack/README.md)0
-rw-r--r--lib/entry/libimagentrytimetrack/src/constants.rs (renamed from libimagentrytimetrack/src/constants.rs)0
-rw-r--r--lib/entry/libimagentrytimetrack/src/error.rs (renamed from libimagentrytimetrack/src/error.rs)0
-rw-r--r--lib/entry/libimagentrytimetrack/src/iter/create.rs (renamed from libimagentrytimetrack/src/iter/create.rs)0
-rw-r--r--lib/entry/libimagentrytimetrack/src/iter/filter.rs (renamed from libimagentrytimetrack/src/iter/filter.rs)0
-rw-r--r--lib/entry/libimagentrytimetrack/src/iter/get.rs (renamed from libimagentrytimetrack/src/iter/get.rs)0
-rw-r--r--lib/entry/libimagentrytimetrack/src/iter/mod.rs (renamed from libimagentrytimetrack/src/iter/mod.rs)0
-rw-r--r--lib/entry/libimagentrytimetrack/src/iter/setendtime.rs (renamed from libimagentrytimetrack/src/iter/setendtime.rs)0
-rw-r--r--lib/entry/libimagentrytimetrack/src/iter/storeid.rs (renamed from libimagentrytimetrack/src/iter/storeid.rs)0
-rw-r--r--lib/entry/libimagentrytimetrack/src/iter/tag.rs (renamed from libimagentrytimetrack/src/iter/tag.rs)0
-rw-r--r--lib/entry/libimagentrytimetrack/src/lib.rs (renamed from libimagentrytimetrack/src/lib.rs)0
-rw-r--r--lib/entry/libimagentrytimetrack/src/result.rs (renamed from libimagentrytimetrack/src/result.rs)0
-rw-r--r--lib/entry/libimagentrytimetrack/src/tag.rs (renamed from libimagentrytimetrack/src/tag.rs)0
-rw-r--r--lib/entry/libimagentrytimetrack/src/timetracking.rs (renamed from libimagentrytimetrack/src/timetracking.rs)0
-rw-r--r--lib/entry/libimagentrytimetrack/src/timetrackingstore.rs (renamed from libimagentrytimetrack/src/timetrackingstore.rs)0
-rw-r--r--lib/entry/libimagentryview/Cargo.toml (renamed from libimagentryview/Cargo.toml)8
-rw-r--r--lib/entry/libimagentryview/src/builtin/editor.rs (renamed from libimagentryview/src/builtin/editor.rs)0
-rw-r--r--lib/entry/libimagentryview/src/builtin/mod.rs (renamed from libimagentryview/src/builtin/mod.rs)0
-rw-r--r--lib/entry/libimagentryview/src/builtin/plain.rs (renamed from libimagentryview/src/builtin/plain.rs)0
-rw-r--r--lib/entry/libimagentryview/src/builtin/stdout.rs (renamed from libimagentryview/src/builtin/stdout.rs)0
-rw-r--r--lib/entry/libimagentryview/src/error.rs (renamed from libimagentryview/src/error.rs)0
-rw-r--r--lib/entry/libimagentryview/src/lib.rs (renamed from libimagentryview/src/lib.rs)0
-rw-r--r--lib/entry/libimagentryview/src/result.rs (renamed from libimagentryview/src/result.rs)0
-rw-r--r--lib/entry/libimagentryview/src/viewer.rs (renamed from libimagentryview/src/viewer.rs)0
-rw-r--r--lib/etc/libimaginteraction/Cargo.toml (renamed from libimaginteraction/Cargo.toml)8
l---------lib/etc/libimaginteraction/README.md (renamed from libimaginteraction/README.md)0
-rw-r--r--lib/etc/libimaginteraction/src/ask.rs (renamed from libimaginteraction/src/ask.rs)0
-rw-r--r--lib/etc/libimaginteraction/src/error.rs (renamed from libimaginteraction/src/error.rs)0
-rw-r--r--lib/etc/libimaginteraction/src/filter.rs (renamed from libimaginteraction/src/filter.rs)0
-rw-r--r--lib/etc/libimaginteraction/src/lib.rs (renamed from libimaginteraction/src/lib.rs)0
-rw-r--r--lib/etc/libimaginteraction/src/readline.rs (renamed from libimaginteraction/src/readline.rs)0
-rw-r--r--lib/etc/libimaginteraction/src/result.rs (renamed from libimaginteraction/src/result.rs)0
-rw-r--r--lib/etc/libimaginteraction/src/ui.rs (renamed from libimaginteraction/src/ui.rs)0
-rw-r--r--lib/etc/libimagtimeui/Cargo.toml (renamed from libimagtimeui/Cargo.toml)0
-rw-r--r--lib/etc/libimagtimeui/src/cli.rs (renamed from libimagtimeui/src/cli.rs)0
-rw-r--r--lib/etc/libimagtimeui/src/date.rs (renamed from libimagtimeui/src/date.rs)0
-rw-r--r--lib/etc/libimagtimeui/src/datetime.rs (renamed from libimagtimeui/src/datetime.rs)0
-rw-r--r--lib/etc/libimagtimeui/src/lib.rs (renamed from libimagtimeui/src/lib.rs)0
-rw-r--r--lib/etc/libimagtimeui/src/parse.rs (renamed from libimagtimeui/src/parse.rs)0
-rw-r--r--lib/etc/libimagtimeui/src/time.rs (renamed from libimagtimeui/src/time.rs)0
-rw-r--r--lib/etc/libimagtimeui/src/ui.rs (renamed from libimagtimeui/src/ui.rs)0
-rw-r--r--lib/etc/libimagutil/.gitignore (renamed from libimagutil/.gitignore)0
-rw-r--r--lib/etc/libimagutil/Cargo.toml (renamed from libimagutil/Cargo.toml)0
l---------lib/etc/libimagutil/README.md (renamed from libimagutil/README.md)0
-rw-r--r--lib/etc/libimagutil/src/cli_validators.rs (renamed from libimagutil/src/cli_validators.rs)0
-rw-r--r--lib/etc/libimagutil/src/debug_result.rs (renamed from libimagutil/src/debug_result.rs)0
-rw-r--r--lib/etc/libimagutil/src/edit.rs (renamed from libimagutil/src/edit.rs)0
-rw-r--r--lib/etc/libimagutil/src/info_result.rs (renamed from libimagutil/src/info_result.rs)0
-rw-r--r--lib/etc/libimagutil/src/iter.rs (renamed from libimagutil/src/iter.rs)0
-rw-r--r--lib/etc/libimagutil/src/key_value_split.rs (renamed from libimagutil/src/key_value_split.rs)0
-rw-r--r--lib/etc/libimagutil/src/lib.rs (renamed from libimagutil/src/lib.rs)0
-rw-r--r--lib/etc/libimagutil/src/log_result.rs (renamed from libimagutil/src/log_result.rs)0
-rw-r--r--lib/etc/libimagutil/src/testing.rs (renamed from libimagutil/src/testing.rs)0
-rw-r--r--lib/etc/libimagutil/src/variants.rs (renamed from libimagutil/src/variants.rs)0
-rw-r--r--lib/etc/libimagutil/src/warn_exit.rs (renamed from libimagutil/src/warn_exit.rs)0
-rw-r--r--lib/etc/libimagutil/src/warn_result.rs (renamed from libimagutil/src/warn_result.rs)0
-rw-r--r--libimagannotation/Cargo.toml21
326 files changed, 268 insertions, 261 deletions
diff --git a/.imag-documentation/Cargo.toml b/.imag-documentation/Cargo.toml
index 16466409..7c1cb67f 100644
--- a/.imag-documentation/Cargo.toml
+++ b/.imag-documentation/Cargo.toml
@@ -15,27 +15,28 @@ homepage = "http://imag-pim.org"
[dependencies]
-libimagannotation = { version = "0.4.0", path = "../libimagannotation" }
-libimagbookmark = { version = "0.4.0", path = "../libimagbookmark" }
-libimagcounter = { version = "0.4.0", path = "../libimagcounter" }
-libimagdiary = { version = "0.4.0", path = "../libimagdiary" }
-libimagentrycategory = { version = "0.4.0", path = "../libimagentrycategory" }
-libimagentrydatetime = { version = "0.4.0", path = "../libimagentrydatetime" }
-libimagentryedit = { version = "0.4.0", path = "../libimagentryedit" }
-libimagentryfilter = { version = "0.4.0", path = "../libimagentryfilter" }
-libimagentrylink = { version = "0.4.0", path = "../libimagentrylink" }
-libimagentrylist = { version = "0.4.0", path = "../libimagentrylist" }
-libimagentrymarkdown = { version = "0.4.0", path = "../libimagentrymarkdown" }
-libimagentrytag = { version = "0.4.0", path = "../libimagentrytag" }
-libimagentrytimetrack = { version = "0.4.0", path = "../libimagentrytimetrack" }
-libimagentryview = { version = "0.4.0", path = "../libimagentryview" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimaginteraction = { version = "0.4.0", path = "../libimaginteraction" }
-libimagmail = { version = "0.4.0", path = "../libimagmail" }
-libimagnotes = { version = "0.4.0", path = "../libimagnotes" }
-libimagref = { version = "0.4.0", path = "../libimagref" }
-libimagrt = { version = "0.4.0", path = "../libimagrt" }
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagtimeui = { version = "0.4.0", path = "../libimagtimeui" }
-libimagtodo = { version = "0.4.0", path = "../libimagtodo" }
-libimagutil = { version = "0.4.0", path = "../libimagutil" }
+libimagbookmark = { version = "0.4.0", path = "../lib/domain/libimagbookmark" }
+libimagcounter = { version = "0.4.0", path = "../lib/domain/libimagcounter" }
+libimagdiary = { version = "0.4.0", path = "../lib/domain/libimagdiary" }
+libimagentryannotation = { version = "0.4.0", path = "../lib/entry/libimagentryannotation" }
+libimagentrycategory = { version = "0.4.0", path = "../lib/entry/libimagentrycategory" }
+libimagentrydatetime = { version = "0.4.0", path = "../lib/entry/libimagentrydatetime" }
+libimagentryedit = { version = "0.4.0", path = "../lib/entry/libimagentryedit" }
+libimagentryfilter = { version = "0.4.0", path = "../lib/entry/libimagentryfilter" }
+libimagentrylink = { version = "0.4.0", path = "../lib/entry/libimagentrylink" }
+libimagentrylist = { version = "0.4.0", path = "../lib/entry/libimagentrylist" }
+libimagentrymarkdown = { version = "0.4.0", path = "../lib/entry/libimagentrymarkdown" }
+libimagentryref = { version = "0.4.0", path = "../lib/entry/libimagentryref" }
+libimagentrytag = { version = "0.4.0", path = "../lib/entry/libimagentrytag" }
+libimagentrytimetrack = { version = "0.4.0", path = "../lib/entry/libimagentrytimetrack" }
+libimagentryview = { version = "0.4.0", path = "../lib/entry/libimagentryview" }
+libimagerror = { version = "0.4.0", path = "../lib/core/libimagerror" }
+libimaginteraction = { version = "0.4.0", path = "../lib/etc/libimaginteraction" }
+libimagmail = { version = "0.4.0", path = "../lib/domain/libimagmail" }
+libimagnotes = { version = "0.4.0", path = "../lib/domain/libimagnotes" }
+libimagrt = { version = "0.4.0", path = "../lib/core/libimagrt" }
+libimagstore = { version = "0.4.0", path = "../lib/core/libimagstore" }
+libimagtimeui = { version = "0.4.0", path = "../lib/etc/libimagtimeui" }
+libimagtodo = { version = "0.4.0", path = "../lib/domain/libimagtodo" }
+libimagutil = { version = "0.4.0", path = "../lib/etc/libimagutil" }
+
diff --git a/Cargo.toml b/Cargo.toml
index e6121515..e991b1cf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,41 +1,41 @@
[workspace]
members = [
".imag-documentation",
- "bin",
- "imag-bookmark",
- "imag-counter",
- "imag-diary",
- "imag-link",
- "imag-mail",
- "imag-notes",
- "imag-ref",
- "imag-store",
- "imag-tag",
- "imag-timetrack",
- "imag-todo",
- "imag-view",
- "libimagannotation",
- "libimagbookmark",
- "libimagcounter",
- "libimagdiary",
- "libimagentrycategory",
- "libimagentrydatetime",
- "libimagentryedit",
- "libimagentryfilter",
- "libimagentrylink",
- "libimagentrylist",
- "libimagentrymarkdown",
- "libimagentrytag",
- "libimagentrytimetrack",
- "libimagentryview",
- "libimagerror",
- "libimaginteraction",
- "libimagmail",
- "libimagnotes",
- "libimagref",
- "libimagrt",
- "libimagstore",
- "libimagtimeui",
- "libimagtodo",
- "libimagutil",
+ "bin/core/imag",
+ "bin/core/imag-link",
+ "bin/core/imag-ref",
+ "bin/core/imag-store",
+ "bin/core/imag-tag",
+ "bin/core/imag-view",
+ "bin/domain/imag-bookmark",
+ "bin/domain/imag-counter",
+ "bin/domain/imag-diary",
+ "bin/domain/imag-mail",
+ "bin/domain/imag-notes",
+ "bin/domain/imag-timetrack",
+ "bin/domain/imag-todo",
+ "lib/core/libimagerror",
+ "lib/core/libimagrt",
+ "lib/core/libimagstore",
+ "lib/domain/libimagbookmark",
+ "lib/domain/libimagcounter",
+ "lib/domain/libimagdiary",
+ "lib/domain/libimagmail",
+ "lib/domain/libimagnotes",
+ "lib/domain/libimagtodo",
+ "lib/entry/libimagentryannotation",
+ "lib/entry/libimagentrycategory",
+ "lib/entry/libimagentrydatetime",
+ "lib/entry/libimagentryedit",
+ "lib/entry/libimagentryfilter",
+ "lib/entry/libimagentrylink",
+ "lib/entry/libimagentrylist",
+ "lib/entry/libimagentrymarkdown",
+ "lib/entry/libimagentryref",
+ "lib/entry/libimagentrytag",
+ "lib/entry/libimagentrytimetrack",
+ "lib/entry/libimagentryview",
+ "lib/etc/libimaginteraction",
+ "lib/etc/libimagtimeui",
+ "lib/etc/libimagutil",
]
diff --git a/imag-link/Cargo.toml b/bin/core/imag-link/Cargo.toml
index a0abd315..7b2c1884 100644
--- a/imag-link/Cargo.toml
+++ b/bin/core/imag-link/Cargo.toml
@@ -22,15 +22,15 @@ toml = "^0.4"
toml-query = "0.1"
url = "1.2"
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagrt = { version = "0.4.0", path = "../libimagrt" }
-libimagentrylink = { version = "0.4.0", path = "../libimagentrylink" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimagutil = { version = "0.4.0", path = "../libimagutil" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagentrylink = { version = "0.4.0", path = "../../../lib/entry/libimagentrylink" }
+libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
[dev-dependencies.libimagutil]
version = "0.4.0"
-path = "../libimagutil"
+path = "../../../lib/etc/libimagutil"
default-features = false
features = ["testing"]
diff --git a/imag-link/README.md b/bin/core/imag-link/README.md
index 5cec1238..5cec1238 120000
--- a/imag-link/README.md
+++ b/bin/core/imag-link/README.md
diff --git a/imag-link/src/main.rs b/bin/core/imag-link/src/main.rs
index 45c08325..45c08325 100644
--- a/imag-link/src/main.rs
+++ b/bin/core/imag-link/src/main.rs
diff --git a/imag-link/src/ui.rs b/bin/core/imag-link/src/ui.rs
index 2b83fb1e..2b83fb1e 100644
--- a/imag-link/src/ui.rs
+++ b/bin/core/imag-link/src/ui.rs
diff --git a/bin/core/imag-ref/Cargo.toml b/bin/core/imag-ref/Cargo.toml
new file mode 100644
index 00000000..72028da0
--- /dev/null
+++ b/bin/core/imag-ref/Cargo.toml
@@ -0,0 +1,29 @@
+[package]
+name = "imag-ref"
+version = "0.4.0"
+authors = ["Matthias Beyer <mail@beyermatthias.de>"]
+
+description = "Part of the imag core distribution: imag-ref command"
+
+keywords = ["imag", "PIM", "personal", "information", "management"]
+readme = "../README.md"
+license = "LGPL-2.1"
+
+documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html"
+repository = "https://github.com/matthiasbeyer/imag"
+homepage = "http://imag-pim.org"
+
+[dependencies]
+semver = "0.5.1"
+clap = ">=2.17"
+log = "0.3"
+version = "2.0.1"
+
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagref = { version = "0.4.0", path = "../../../lib/entry/libimagentryref" }
+libimagentrylist = { version = "0.4.0", path = "../../../lib/entry/libimagentrylist" }
+libimaginteraction = { version = "0.4.0", path = "../../../lib/etc/libimaginteraction" }
+libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
+
diff --git a/imag-ref/README.md b/bin/core/imag-ref/README.md
index aea1eea8..aea1eea8 120000
--- a/imag-ref/README.md
+++ b/bin/core/imag-ref/README.md
diff --git a/imag-ref/src/main.rs b/bin/core/imag-ref/src/main.rs
index 3c925873..3c925873 100644
--- a/imag-ref/src/main.rs
+++ b/bin/core/imag-ref/src/main.rs
diff --git a/imag-ref/src/ui.rs b/bin/core/imag-ref/src/ui.rs
index 5c4685e2..5c4685e2 100644
--- a/imag-ref/src/ui.rs
+++ b/bin/core/imag-ref/src/ui.rs
diff --git a/imag-store/Cargo.toml b/bin/core/imag-store/Cargo.toml
index 59b5ad46..d2e47410 100644
--- a/imag-store/Cargo.toml
+++ b/bin/core/imag-store/Cargo.toml
@@ -20,10 +20,10 @@ version = "2.0.1"
semver = "0.5"
toml = "^0.4"
-libimagstore = { version = "0.4.0", path = "../libimagstore", default-features = false, features = ["verify"] }
-libimagrt = { version = "0.4.0", path = "../libimagrt" }
-libimagutil = { version = "0.4.0", path = "../libimagutil" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore", features = ["verify"] }
+libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
[features]
early-panic = [ "libimagstore/early-panic" ]
diff --git a/imag-store/README.md b/bin/core/imag-store/README.md
index e3a42a13..e3a42a13 120000
--- a/imag-store/README.md
+++ b/bin/core/imag-store/README.md
diff --git a/imag-store/src/create.rs b/bin/core/imag-store/src/create.rs
index e015595f..e015595f 100644
--- a/imag-store/src/create.rs
+++ b/bin/core/imag-store/src/create.rs
diff --git a/imag-store/src/delete.rs b/bin/core/imag-store/src/delete.rs
index 1413de77..1413de77 100644
--- a/imag-store/src/delete.rs
+++ b/bin/core/imag-store/src/delete.rs
diff --git a/imag-store/src/dump.rs b/bin/core/imag-store/src/dump.rs
index 810c6819..810c6819 100644
--- a/imag-store/src/dump.rs
+++ b/bin/core/imag-store/src/dump.rs
diff --git a/imag-store/src/error.rs b/bin/core/imag-store/src/error.rs
index bc248ade..bc248ade 100644
--- a/imag-store/src/error.rs
+++ b/bin/core/imag-store/src/error.rs
diff --git a/imag-store/src/get.rs b/bin/core/imag-store/src/get.rs
index 0c2aa132..0c2aa132 100644
--- a/imag-store/src/get.rs
+++ b/bin/core/imag-store/src/get.rs
diff --git a/imag-store/src/main.rs b/bin/core/imag-store/src/main.rs
index c425bf7b..c425bf7b 100644
--- a/imag-store/src/main.rs
+++ b/bin/core/imag-store/src/main.rs
diff --git a/imag-store/src/retrieve.rs b/bin/core/imag-store/src/retrieve.rs
index 19c85b16..19c85b16 100644
--- a/imag-store/src/retrieve.rs
+++ b/bin/core/imag-store/src/retrieve.rs
diff --git a/imag-store/src/ui.rs b/bin/core/imag-store/src/ui.rs
index bad56bd1..bad56bd1 100644
--- a/imag-store/src/ui.rs
+++ b/bin/core/imag-store/src/ui.rs
diff --git a/imag-store/src/update.rs b/bin/core/imag-store/src/update.rs
index bdcfb6de..bdcfb6de 100644
--- a/imag-store/src/update.rs
+++ b/bin/core/imag-store/src/update.rs
diff --git a/imag-store/src/util.rs b/bin/core/imag-store/src/util.rs
index 5da04666..5da04666 100644
--- a/imag-store/src/util.rs
+++ b/bin/core/imag-store/src/util.rs
diff --git a/imag-store/src/verify.rs b/bin/core/imag-store/src/verify.rs
index 6c9cb703..6c9cb703 100644
--- a/imag-store/src/verify.rs
+++ b/bin/core/imag-store/src/verify.rs
diff --git a/imag-store/tests/001-create_test.sh b/bin/core/imag-store/tests/001-create_test.sh
index 591c15ba..591c15ba 100644
--- a/imag-store/tests/001-create_test.sh
+++ b/bin/core/imag-store/tests/001-create_test.sh
diff --git a/imag-store/tests/002-retrieve_test.sh b/bin/core/imag-store/tests/002-retrieve_test.sh
index e7ba5962..e7ba5962 100644
--- a/imag-store/tests/002-retrieve_test.sh
+++ b/bin/core/imag-store/tests/002-retrieve_test.sh
diff --git a/imag-store/tests/003-delete_test.sh b/bin/core/imag-store/tests/003-delete_test.sh
index a3d890e5..a3d890e5 100644
--- a/imag-store/tests/003-delete_test.sh
+++ b/bin/core/imag-store/tests/003-delete_test.sh
diff --git a/imag-store/tests/Makefile b/bin/core/imag-store/tests/Makefile
index c58562d7..c58562d7 100644
--- a/imag-store/tests/Makefile
+++ b/bin/core/imag-store/tests/Makefile
diff --git a/imag-store/tests/utils.sh b/bin/core/imag-store/tests/utils.sh
index 60be71aa..60be71aa 100644
--- a/imag-store/tests/utils.sh
+++ b/bin/core/imag-store/tests/utils.sh
diff --git a/imag-tag/Cargo.toml b/bin/core/imag-tag/Cargo.toml
index 3c9581d8..afd41e61 100644
--- a/imag-tag/Cargo.toml
+++ b/bin/core/imag-tag/Cargo.toml
@@ -20,11 +20,11 @@ version = "2.0.1"
semver = "0.2"
toml = "^0.4"
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagrt = { version = "0.4.0", path = "../libimagrt" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimagentrytag = { version = "0.4.0", path = "../libimagentrytag" }
-libimagutil = { version = "0.4.0", path = "../libimagutil" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagentrytag = { version = "0.4.0", path = "../../../lib/entry/libimagentrytag" }
+libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
[dev-dependencies]
toml-query = "0.3.0"
@@ -32,7 +32,7 @@ env_logger = "0.3"
[dev-dependencies.libimagutil]
version = "0.4.0"
-path = "../libimagutil"
+path = "../../../lib/etc/libimagutil"
default-features = false
features = ["testing"]
diff --git a/imag-tag/README.md b/bin/core/imag-tag/README.md
index 40828c4c..40828c4c 120000
--- a/imag-tag/README.md
+++ b/bin/core/imag-tag/README.md
diff --git a/imag-tag/src/main.rs b/bin/core/imag-tag/src/main.rs
index c4f7eb3f..c4f7eb3f 100644
--- a/imag-tag/src/main.rs
+++ b/bin/core/imag-tag/src/main.rs
diff --git a/imag-tag/src/ui.rs b/bin/core/imag-tag/src/ui.rs
index ee9b6feb..ee9b6feb 100644
--- a/imag-tag/src/ui.rs
+++ b/bin/core/imag-tag/src/ui.rs
diff --git a/imag-view/Cargo.toml b/bin/core/imag-view/Cargo.toml
index ed6ca69c..ad4456a9 100644
--- a/imag-view/Cargo.toml
+++ b/bin/core/imag-view/Cargo.toml
@@ -20,7 +20,8 @@ semver = "0.5"
toml = "^0.4"
version = "2.0.1"
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagrt = { version = "0.4.0", path = "../libimagrt" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimagentryview = { version = "0.4.0", path = "../libimagentryview" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagentryview = { version = "0.4.0", path = "../../../lib/entry/libimagentryview" }
+
diff --git a/imag-view/README.md b/bin/core/imag-view/README.md
index 2f44c383..2f44c383 120000
--- a/imag-view/README.md
+++ b/bin/core/imag-view/README.md
diff --git a/imag-view/src/editor.rs b/bin/core/imag-view/src/editor.rs
index bbd255f7..bbd255f7 100644
--- a/imag-view/src/editor.rs
+++ b/bin/core/imag-view/src/editor.rs
diff --git a/imag-view/src/main.rs b/bin/core/imag-view/src/main.rs
index da20fa54..da20fa54 100644
--- a/imag-view/src/main.rs
+++ b/bin/core/imag-view/src/main.rs
diff --git a/imag-view/src/ui.rs b/bin/core/imag-view/src/ui.rs
index dd165850..dd165850 100644
--- a/imag-view/src/ui.rs
+++ b/bin/core/imag-view/src/ui.rs
diff --git a/bin/Cargo.toml b/bin/core/imag/Cargo.toml
index ffaba517..2333f7bb 100644
--- a/bin/Cargo.toml
+++ b/bin/core/imag/Cargo.toml
@@ -16,9 +16,9 @@ homepage = "http://imag-pim.org"
[build-dependencies]
clap = ">=2.16.1"
version = "2.0"
-libimagrt = { path = "../libimagrt" }
-libimagentrytag = { path = "../libimagentrytag" }
-libimagutil = { path = "../libimagutil" }
+libimagrt = { path = "../../../lib/core/libimagrt" }
+libimagentrytag = { path = "../../../lib/entry/libimagentrytag" }
+libimagutil = { path = "../../../lib/etc/libimagutil" }
[dependencies]
version = "2.0"
@@ -26,6 +26,7 @@ walkdir = "0.1"
clap = "2.*"
log = "0.3"
-libimagrt = { version = "0.4.0", path = "../libimagrt" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
+libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+
diff --git a/bin/src/main.rs b/bin/core/imag/src/main.rs
index b9e4ab45..b9e4ab45 100644
--- a/bin/src/main.rs
+++ b/bin/core/imag/src/main.rs
diff --git a/imag-bookmark/Cargo.toml b/bin/domain/imag-bookmark/Cargo.toml
index 6ea269c8..658566d3 100644
--- a/imag-bookmark/Cargo.toml
+++ b/bin/domain/imag-bookmark/Cargo.toml
@@ -18,9 +18,9 @@ clap = ">=2.17"
log = "0.3"
version = "2.0.1"
-libimagrt = { version = "0.4.0", path = "../libimagrt" }
-libimagutil = { version = "0.4.0", path = "../libimagutil" }
-libimagbookmark = { version = "0.4.0", path = "../libimagbookmark" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimagentrylink = { version = "0.4.0", path = "../libimagentrylink" }
-libimagentrytag = { version = "0.4.0", path = "../libimagentrytag" }
+libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagbookmark = { version = "0.4.0", path = "../../../lib/domain/libimagbookmark" }
+libimagentrylink = { version = "0.4.0", path = "../../../lib/entry/libimagentrylink" }
+libimagentrytag = { version = "0.4.0", path = "../../../lib/entry/libimagentrytag" }
+libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
diff --git a/imag-bookmark/README.md b/bin/domain/imag-bookmark/README.md
index 43e7a524..43e7a524 120000
--- a/imag-bookmark/README.md
+++ b/bin/domain/imag-bookmark/README.md
diff --git a/imag-bookmark/src/main.rs b/bin/domain/imag-bookmark/src/main.rs
index e0635164..e0635164 100644
--- a/imag-bookmark/src/main.rs
+++ b/bin/domain/imag-bookmark/src/main.rs
diff --git a/imag-bookmark/src/ui.rs b/bin/domain/imag-bookmark/src/ui.rs
index 0b142574..0b142574 100644
--- a/imag-bookmark/src/ui.rs
+++ b/bin/domain/imag-bookmark/src/ui.rs
diff --git a/imag-counter/Cargo.toml b/bin/domain/imag-counter/Cargo.toml
index 11f303f2..cc905034 100644
--- a/imag-counter/Cargo.toml
+++ b/bin/domain/imag-counter/Cargo.toml
@@ -18,7 +18,8 @@ clap = ">=2.17"
log = "0.3"
version = "2.0.1"
-libimagrt = { version = "0.4.0", path = "../libimagrt" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimagutil = { version = "0.4.0", path = "../libimagutil" }
-libimagcounter = { version = "0.4.0", path = "../libimagcounter" }
+libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
+libimagcounter = { version = "0.4.0", path = "../../../lib/domain/libimagcounter" }
+
diff --git a/imag-counter/README.md b/bin/domain/imag-counter/README.md
index b52d8802..b52d8802 120000
--- a/imag-counter/README.md
+++ b/bin/domain/imag-counter/README.md
diff --git a/imag-counter/src/create.rs b/bin/domain/imag-counter/src/create.rs
index 9ef66387..9ef66387 100644
--- a/imag-counter/src/create.rs
+++ b/bin/domain/imag-counter/src/create.rs
diff --git a/imag-counter/src/delete.rs b/bin/domain/imag-counter/src/delete.rs
index 8a358284..8a358284 100644
--- a/imag-counter/src/delete.rs
+++ b/bin/domain/imag-counter/src/delete.rs
diff --git a/imag-counter/src/interactive.rs b/bin/domain/imag-counter/src/interactive.rs
index c4a8fa65..c4a8fa65 100644
--- a/imag-counter/src/interactive.rs
+++ b/bin/domain/imag-counter/src/interactive.rs
diff --git a/imag-counter/src/list.rs b/bin/domain/imag-counter/src/list.rs
index d8d3e86e..d8d3e86e 100644
--- a/imag-counter/src/list.rs
+++ b/bin/domain/imag-counter/src/list.rs
diff --git a/imag-counter/src/main.rs b/bin/domain/imag-counter/src/main.rs
index 35a22441..35a22441 100644
--- a/imag-counter/src/main.rs
+++ b/bin/domain/imag-counter/src/main.rs
diff --git a/imag-counter/src/ui.rs b/bin/domain/imag-counter/src/ui.rs
index 2b928dd8..2b928dd8 100644
--- a/imag-counter/src/ui.rs
+++ b/bin/domain/imag-counter/src/ui.rs
diff --git a/bin/domain/imag-diary/Cargo.toml b/bin/domain/imag-diary/Cargo.toml
new file mode 100644
index 00000000..e7e75b4a
--- /dev/null
+++ b/bin/domain/imag-diary/Cargo.toml
@@ -0,0 +1,31 @@
+[package]
+name = "imag-diary"
+version = "0.4.0"
+authors = ["Matthias Beyer <mail@beyermatthias.de>"]
+
+description = "Part of the imag core distribution: imag-diary command"
+
+keywords = ["imag", "PIM", "personal", "information", "management"]
+readme = "../README.md"
+license = "LGPL-2.1"
+
+documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html"
+repository = "https://github.com/matthiasbeyer/imag"
+homepage = "http://imag-pim.org"
+
+[dependencies]
+chrono = "0.4"
+version = "2.0"
+clap = "2.*"
+log = "0.3"
+
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
+libimagdiary = { version = "0.4.0", path = "../../../lib/domain/libimagdiary" }
+libimagentryedit = { version = "0.4.0", path = "../../../lib/entry/libimagentryedit" }
+libimagentrylist = { version = "0.4.0", path = "../../../lib/entry/libimagentrylist" }
+libimaginteraction = { version = "0.4.0", path = "../../../lib/etc/libimaginteraction" }
+libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
+libimagtimeui = { version = "0.4.0", path = "../../../lib/etc/libimagtimeui" }
+
diff --git a/imag-diary/README.md b/bin/domain/imag-diary/README.md
index 1aab1ab7..1aab1ab7 120000
--- a/imag-diary/README.md
+++ b/bin/domain/imag-diary/README.md
diff --git a/imag-diary/src/create.rs b/bin/domain/imag-diary/src/create.rs
index 78f679a7..78f679a7 100644
--- a/imag-diary/src/create.rs
+++ b/bin/domain/imag-diary/src/create.rs
diff --git a/imag-diary/src/delete.rs b/bin/domain/imag-diary/src/delete.rs
index da44bc92..da44bc92 100644
--- a/imag-diary/src/delete.rs
+++ b/bin/domain/imag-diary/src/delete.rs
diff --git a/imag-diary/src/edit.rs b/bin/domain/imag-diary/src/edit.rs
index 1cd5f9e5..1cd5f9e5 100644
--- a/imag-diary/src/edit.rs
+++ b/bin/domain/imag-diary/src/edit.rs
diff --git a/imag-diary/src/list.rs b/bin/domain/imag-diary/src/list.rs
index 4ed3123c..4ed3123c 100644
--- a/imag-diary/src/list.rs
+++ b/bin/domain/imag-diary/src/list.rs
diff --git a/imag-diary/src/main.rs b/bin/domain/imag-diary/src/main.rs
index 844ef3e4..844ef3e4 100644
--- a/imag-diary/src/main.rs
+++ b/bin/domain/imag-diary/src/main.rs
diff --git a/imag-diary/src/ui.rs b/bin/domain/imag-diary/src/ui.rs
index 91712fb6..91712fb6 100644
--- a/imag-diary/src/ui.rs
+++ b/bin/domain/imag-diary/src/ui.rs
diff --git a/imag-diary/src/util.rs b/bin/domain/imag-diary/src/util.rs
index 25498085..25498085 100644
--- a/imag-diary/src/util.rs
+++ b/bin/domain/imag-diary/src/util.rs
diff --git a/imag-diary/src/view.rs b/bin/domain/imag-diary/src/view.rs
index 041a1fe0..041a1fe0 100644
--- a/imag-diary/src/view.rs
+++ b/bin/domain/imag-diary/src/view.rs
diff --git a/imag-mail/Cargo.toml b/bin/domain/imag-mail/Cargo.toml
index 5d4123a4..489881a7 100644
--- a/imag-mail/Cargo.toml
+++ b/bin/domain/imag-mail/Cargo.toml
@@ -17,8 +17,9 @@ version = "2.0.1"
toml = "0.4.*"
url = "1.2"
-libimagrt = { version = "0.4.0", path = "../libimagrt" }
-libimagmail = { version = "0.4.0", path = "../libimagmail" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimagutil = { version = "0.4.0", path = "../libimagutil" }
-libimagref = { version = "0.4.0", path = "../libimagref" }
+libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagmail = { version = "0.4.0", path = "../../../lib/domain/libimagmail" }
+libimagref = { version = "0.4.0", path = "../../../lib/entry/libimagentryref" }
+libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
+
diff --git a/imag-mail/README.md b/bin/domain/imag-mail/README.md
index d5d8fb01..d5d8fb01 120000
--- a/imag-mail/README.md
+++ b/bin/domain/imag-mail/README.md
diff --git a/imag-mail/src/main.rs b/bin/domain/imag-mail/src/main.rs
index bdd51bdb..bdd51bdb 100644
--- a/imag-mail/src/main.rs
+++ b/bin/domain/imag-mail/src/main.rs
diff --git a/imag-mail/src/ui.rs b/bin/domain/imag-mail/src/ui.rs
index 3e999949..3e999949 100644
--- a/imag-mail/src/ui.rs
+++ b/bin/domain/imag-mail/src/ui.rs
diff --git a/imag-notes/Cargo.toml b/bin/domain/imag-notes/Cargo.toml
index e3a056bd..e274e3d8 100644
--- a/imag-notes/Cargo.toml
+++ b/bin/domain/imag-notes/Cargo.toml
@@ -20,9 +20,9 @@ log = "0.3"
version = "2.0.1"
itertools = "0.5"
-libimagrt = { version = "0.4.0", path = "../libimagrt" }
-libimagnotes = { version = "0.4.0", path = "../libimagnotes" }
-libimagentryedit = { version = "0.4.0", path = "../libimagentryedit" }
-libimagentrytag = { version = "0.4.0", path = "../libimagentrytag" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimagutil = { version = "0.4.0", path = "../libimagutil" }
+libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagnotes = { version = "0.4.0", path = "../../../lib/domain/libimagnotes" }
+libimagentryedit = { version = "0.4.0", path = "../../../lib/entry/libimagentryedit" }
+libimagentrytag = { version = "0.4.0", path = "../../../lib/entry/libimagentrytag" }
+libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
diff --git a/imag-notes/src/main.rs b/bin/domain/imag-notes/src/main.rs
index 697c034d..697c034d 100644
--- a/imag-notes/src/main.rs
+++ b/bin/domain/imag-notes/src/main.rs
diff --git a/imag-notes/src/ui.rs b/bin/domain/imag-notes/src/ui.rs
index 906c5524..906c5524 100644
--- a/imag-notes/src/ui.rs
+++ b/bin/domain/imag-notes/src/ui.rs
diff --git a/imag-timetrack/Cargo.toml b/bin/domain/imag-timetrack/Cargo.toml
index 9c38e5bc..8c19478b 100644
--- a/imag-timetrack/Cargo.toml
+++ b/bin/domain/imag-timetrack/Cargo.toml
@@ -23,8 +23,8 @@ chrono = "^0.4"
filters = "0.1.1"
itertools = "0.6"
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagrt = { version = "0.4.0", path = "../libimagrt" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimagentrytimetrack = { version = "0.4.0", path = "../libimagentrytimetrack" }
-libimagutil = { version = "0.4.0", path = "../libimagutil" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagentrytimetrack = { version = "0.4.0", path = "../../../lib/entry/libimagentrytimetrack" }
+libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
diff --git a/imag-timetrack/src/cont.rs b/bin/domain/imag-timetrack/src/cont.rs
index 86563672..86563672 100644
--- a/imag-timetrack/src/cont.rs
+++ b/bin/domain/imag-timetrack/src/cont.rs
diff --git a/imag-timetrack/src/day.rs b/bin/domain/imag-timetrack/src/day.rs
index 04d36044..04d36044 100644
--- a/imag-timetrack/src/day.rs
+++ b/bin/domain/imag-timetrack/src/day.rs
diff --git a/imag-timetrack/src/list.rs b/bin/domain/imag-timetrack/src/list.rs
index b7d8dcd3..b7d8dcd3 100644
--- a/imag-timetrack/src/list.rs
+++ b/bin/domain/imag-timetrack/src/list.rs
diff --git a/imag-timetrack/src/main.rs b/bin/domain/imag-timetrack/src/main.rs
index 7546e6b9..7546e6b9 100644
--- a/imag-timetrack/src/main.rs
+++ b/bin/domain/imag-timetrack/src/main.rs
diff --git a/imag-timetrack/src/month.rs b/bin/domain/imag-timetrack/src/month.rs
index 0f9872c3..0f9872c3 100644
--- a/imag-timetrack/src/month.rs
+++ b/bin/domain/imag-timetrack/src/month.rs
diff --git a/imag-timetrack/src/start.rs b/bin/domain/imag-timetrack/src/start.rs
index 8518f566..8518f566 100644
--- a/imag-timetrack/src/start.rs
+++ b/bin/domain/imag-timetrack/src/start.rs
diff --git a/imag-timetrack/src/stop.rs b/bin/domain/imag-timetrack/src/stop.rs
index 29b03a02..29b03a02 100644
--- a/imag-timetrack/src/stop.rs
+++ b/bin/domain/imag-timetrack/src/stop.rs
diff --git a/imag-timetrack/src/track.rs b/bin/domain/imag-timetrack/src/track.rs
index a723b909..a723b909 100644
--- a/imag-timetrack/src/track.rs
+++ b/bin/domain/imag-timetrack/src/track.rs
diff --git a/imag-timetrack/src/ui.rs b/bin/domain/imag-timetrack/src/ui.rs
index cefcef86..cefcef86 100644
--- a/imag-timetrack/src/ui.rs
+++ b/bin/domain/imag-timetrack/src/ui.rs
diff --git a/imag-timetrack/src/week.rs b/bin/domain/imag-timetrack/src/week.rs
index 4793c4e2..4793c4e2 100644
--- a/imag-timetrack/src/week.rs
+++ b/bin/domain/imag-timetrack/src/week.rs
diff --git a/imag-timetrack/src/year.rs b/bin/domain/imag-timetrack/src/year.rs
index 8534de1a..8534de1a 100644
--- a/imag-timetrack/src/year.rs
+++ b/bin/domain/imag-timetrack/src/year.rs
diff --git a/imag-todo/Cargo.toml b/bin/domain/imag-todo/Cargo.toml
index 19ba431a..047cdd50 100644
--- a/imag-todo/Cargo.toml
+++ b/bin/domain/imag-todo/Cargo.toml
@@ -25,7 +25,7 @@ toml-query = "0.3.*"
is-match = "0.1.*"
version = "2.0.1"
-libimagrt = { version = "0.4.0", path = "../libimagrt" }
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagtodo = { version = "0.4.0", path = "../libimagtodo" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
+libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagtodo = { version = "0.4.0", path = "../../../lib/domain/libimagtodo" }
diff --git a/imag-todo/etc/on-add.sh b/bin/domain/imag-todo/etc/on-add.sh
index a58e4989..a58e4989 100644
--- a/imag-todo/etc/on-add.sh
+++ b/bin/domain/imag-todo/etc/on-add.sh
diff --git a/imag-todo/etc/on-modify.sh b/bin/domain/imag-todo/etc/on-modify.sh
index 89be96d0..89be96d0 100644
--- a/imag-todo/etc/on-modify.sh
+++ b/bin/domain/imag-todo/etc/on-modify.sh
diff --git a/imag-todo/src/main.rs b/bin/domain/imag-todo/src/main.rs
index b9bd8872..b9bd8872 100644
--- a/imag-todo/src/main.rs
+++ b/bin/domain/imag-todo/src/main.rs
diff --git a/imag-todo/src/ui.rs b/bin/domain/imag-todo/src/ui.rs
index 795c76c6..795c76c6 100644
--- a/imag-todo/src/ui.rs
+++ b/bin/domain/imag-todo/src/ui.rs
diff --git a/imag-diary/Cargo.toml b/imag-diary/Cargo.toml
deleted file mode 100644
index cb20c794..00000000
--- a/imag-diary/Cargo.toml
+++ /dev/null
@@ -1,30 +0,0 @@
-[package]
-name = "imag-diary"
-version = "0.4.0"
-authors = ["Matthias Beyer <mail@beyermatthias.de>"]
-
-description = "Part of the imag core distribution: imag-diary command"
-
-keywords = ["imag", "PIM", "personal", "information", "management"]
-readme = "../README.md"
-license = "LGPL-2.1"
-
-documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html"
-repository = "https://github.com/matthiasbeyer/imag"
-homepage = "http://imag-pim.org"
-
-[dependencies]
-chrono = "0.4"
-version = "2.0"
-clap = "2.*"
-log = "0.3"
-
-libimagrt = { version = "0.4.0", path = "../libimagrt" }
-libimagdiary = { version = "0.4.0", path = "../libimagdiary" }
-libimagentryedit = { version = "0.4.0", path = "../libimagentryedit" }
-libimagentrylist = { version = "0.4.0", path = "../libimagentrylist" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimaginteraction = { version = "0.4.0", path = "../libimaginteraction" }
-libimagutil = { version = "0.4.0", path = "../libimagutil" }
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagtimeui = { version = "0.4.0", path = "../libimagtimeui" }
diff --git a/imag-ref/Cargo.toml b/imag-ref/Cargo.toml
deleted file mode 100644
index 27ef6701..00000000
--- a/imag-ref/Cargo.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[package]
-name = "imag-ref"
-version = "0.4.0"
-authors = ["Matthias Beyer <mail@beyermatthias.de>"]
-
-description = "Part of the imag core distribution: imag-ref command"
-
-keywords = ["imag", "PIM", "personal", "information", "management"]
-readme = "../README.md"
-license = "LGPL-2.1"
-
-documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html"
-repository = "https://github.com/matthiasbeyer/imag"
-homepage = "http://imag-pim.org"
-
-[dependencies]
-semver = "0.5.1"
-clap = ">=2.17"
-log = "0.3"
-version = "2.0.1"
-
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagrt = { version = "0.4.0", path = "../libimagrt" }
-libimagref = { version = "0.4.0", path = "../libimagref" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimaginteraction = { version = "0.4.0", path = "../libimaginteraction" }
-libimagentrylist = { version = "0.4.0", path = "../libimagentrylist" }
-libimagutil = { version = "0.4.0", path = "../libimagutil" }
diff --git a/libimagerror/Cargo.toml b/lib/core/libimagerror/Cargo.toml
index e1084975..e1084975 100644
--- a/libimagerror/Cargo.toml
+++ b/lib/core/libimagerror/Cargo.toml
diff --git a/libimagerror/README.md b/lib/core/libimagerror/README.md
index 359a1ec1..359a1ec1 120000
--- a/libimagerror/README.md
+++ b/lib/core/libimagerror/README.md
diff --git a/libimagerror/src/error_gen.rs b/lib/core/libimagerror/src/error_gen.rs
index ccfd1575..ccfd1575 100644
--- a/libimagerror/src/error_gen.rs
+++ b/lib/core/libimagerror/src/error_gen.rs
diff --git a/libimagerror/src/into.rs b/lib/core/libimagerror/src/into.rs
index bc3cfb41..bc3cfb41 100644
--- a/libimagerror/src/into.rs
+++ b/lib/core/libimagerror/src/into.rs
diff --git a/libimagerror/src/iter.rs b/lib/core/libimagerror/src/iter.rs
index 0297bc6a..0297bc6a 100644
--- a/libimagerror/src/iter.rs
+++ b/lib/core/libimagerror/src/iter.rs
diff --git a/libimagerror/src/lib.rs b/lib/core/libimagerror/src/lib.rs
index bc4f865d..bc4f865d 100644
--- a/libimagerror/src/lib.rs
+++ b/lib/core/libimagerror/src/lib.rs
diff --git a/libimagerror/src/trace.rs b/lib/core/libimagerror/src/trace.rs
index 3fbc4faf..3fbc4faf 100644
--- a/libimagerror/src/trace.rs
+++ b/lib/core/libimagerror/src/trace.rs
diff --git a/libimagrt/.gitignore b/lib/core/libimagrt/.gitignore
index eb5a316c..eb5a316c 100644
--- a/libimagrt/.gitignore
+++ b/lib/core/libimagrt/.gitignore
diff --git a/libimagrt/Cargo.toml b/lib/core/libimagrt/Cargo.toml
index 052b3117..4f0f0863 100644
--- a/libimagrt/Cargo.toml
+++ b/lib/core/libimagrt/Cargo.toml
@@ -24,6 +24,6 @@ tempfile = "2.1"
ansi_term = "0.9"
is-match = "0.1"
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagutil = { version = "0.4.0", path = "../libimagutil" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
diff --git a/libimagrt/README.md b/lib/core/libimagrt/README.md
index 0fbc1f22..0fbc1f22 120000
--- a/libimagrt/README.md
+++ b/lib/core/libimagrt/README.md
diff --git a/libimagrt/src/configuration.rs b/lib/core/libimagrt/src/configuration.rs
index dcb3326b..dcb3326b 100644
--- a/libimagrt/src/configuration.rs
+++ b/lib/core/libimagrt/src/configuration.rs
diff --git a/libimagrt/src/error.rs b/lib/core/libimagrt/src/error.rs
index 388335af..388335af 100644
--- a/libimagrt/src/error.rs
+++ b/lib/core/libimagrt/src/error.rs
diff --git a/libimagrt/src/lib.rs b/lib/core/libimagrt/src/lib.rs
index 55398013..55398013 100644
--- a/libimagrt/src/lib.rs
+++ b/lib/core/libimagrt/src/lib.rs
diff --git a/libimagrt/src/logger.rs b/lib/core/libimagrt/src/logger.rs
index 992a9d94..992a9d94 100644
--- a/libimagrt/src/logger.rs
+++ b/lib/core/libimagrt/src/logger.rs
diff --git a/libimagrt/src/runtime.rs b/lib/core/libimagrt/src/runtime.rs
index 1b5f3f7c..1b5f3f7c 100644
--- a/libimagrt/src/runtime.rs
+++ b/lib/core/libimagrt/src/runtime.rs
diff --git a/libimagrt/src/setup.rs b/lib/core/libimagrt/src/setup.rs
index 735a8883..735a8883 100644
--- a/libimagrt/src/setup.rs
+++ b/lib/core/libimagrt/src/setup.rs
diff --git a/libimagrt/src/spec.rs b/lib/core/libimagrt/src/spec.rs
index 0293f249..0293f249 100644
--- a/libimagrt/src/spec.rs
+++ b/lib/core/libimagrt/src/spec.rs
diff --git a/libimagstore/.gitignore b/lib/core/libimagstore/.gitignore
index eb5a316c..eb5a316c 100644
--- a/libimagstore/.gitignore
+++ b/lib/core/libimagstore/.gitignore
diff --git a/libimagstore/Cargo.toml b/lib/core/libimagstore/Cargo.toml
index 0e8ed33b..c5fb527f 100644
--- a/libimagstore/Cargo.toml
+++ b/lib/core/libimagstore/Cargo.toml
@@ -30,8 +30,8 @@ serde = "1.0"
serde_json = "1.0"
serde_derive = "1.0"
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimagutil = { version = "0.4.0", path = "../libimagutil" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
[dev-dependencies]
tempdir = "0.3.4"
diff --git a/libimagstore/README.md b/lib/core/libimagstore/README.md
index ccb62530..ccb62530 120000
--- a/libimagstore/README.md
+++ b/lib/core/libimagstore/README.md
diff --git a/libimagstore/src/configuration.rs b/lib/core/libimagstore/src/configuration.rs
index 0dfc0490..0dfc0490 100644
--- a/libimagstore/src/configuration.rs
+++ b/lib/core/libimagstore/src/configuration.rs
diff --git a/libimagstore/src/error.rs b/lib/core/libimagstore/src/error.rs
index 00e47681..00e47681 100644
--- a/libimagstore/src/error.rs
+++ b/lib/core/libimagstore/src/error.rs
diff --git a/libimagstore/src/file_abstraction/fs.rs b/lib/core/libimagstore/src/file_abstraction/fs.rs
index 9fd14456..9fd14456 100644
--- a/libimagstore/src/file_abstraction/fs.rs
+++ b/lib/core/libimagstore/src/file_abstraction/fs.rs
diff --git a/libimagstore/src/file_abstraction/inmemory.rs b/lib/core/libimagstore/src/file_abstraction/inmemory.rs
index 57ca2411..57ca2411 100644
--- a/libimagstore/src/file_abstraction/inmemory.rs
+++ b/lib/core/libimagstore/src/file_abstraction/inmemory.rs
diff --git a/libimagstore/src/file_abstraction/mod.rs b/lib/core/libimagstore/src/file_abstraction/mod.rs
index 07362c35..07362c35 100644
--- a/libimagstore/src/file_abstraction/mod.rs
+++ b/lib/core/libimagstore/src/file_abstraction/mod.rs
diff --git a/libimagstore/src/file_abstraction/stdio/mapper/json.rs b/lib/core/libimagstore/src/file_abstraction/stdio/mapper/json.rs
index 0b66f91c..0b66f91c 100644
--- a/libimagstore/src/file_abstraction/stdio/mapper/json.rs
+++ b/lib/core/libimagstore/src/file_abstraction/stdio/mapper/json.rs
diff --git a/libimagstore/src/file_abstraction/stdio/mapper/mod.rs b/lib/core/libimagstore/src/file_abstraction/stdio/mapper/mod.rs
index f7192b3d..f7192b3d 100644
--- a/libimagstore/src/file_abstraction/stdio/mapper/mod.rs
+++ b/lib/core/libimagstore/src/file_abstraction/stdio/mapper/mod.rs
diff --git a/libimagstore/src/file_abstraction/stdio/mod.rs b/lib/core/libimagstore/src/file_abstraction/stdio/mod.rs
index e2ac5ec4..e2ac5ec4 100644
--- a/libimagstore/src/file_abstraction/stdio/mod.rs
+++ b/lib/core/libimagstore/src/file_abstraction/stdio/mod.rs
diff --git a/libimagstore/src/file_abstraction/stdio/out.rs b/lib/core/libimagstore/src/file_abstraction/stdio/out.rs
index eca99114..eca99114 100644
--- a/libimagstore/src/file_abstraction/stdio/out.rs
+++ b/lib/core/libimagstore/src/file_abstraction/stdio/out.rs
diff --git a/libimagstore/src/lib.rs b/lib/core/libimagstore/src/lib.rs
index ae205b83..ae205b83 100644
--- a/libimagstore/src/lib.rs
+++ b/lib/core/libimagstore/src/lib.rs
diff --git a/libimagstore/src/store.rs b/lib/core/libimagstore/src/store.rs
index a0ee33e5..a0ee33e5 100644
--- a/libimagstore/src/store.rs
+++ b/lib/core/libimagstore/src/store.rs
diff --git a/libimagstore/src/storeid.rs b/lib/core/libimagstore/src/storeid.rs
index 211efbe8..211efbe8 100644
--- a/libimagstore/src/storeid.rs
+++ b/lib/core/libimagstore/src/storeid.rs
diff --git a/libimagstore/src/toml_ext.rs b/lib/core/libimagstore/src/toml_ext.rs
index 9c0ae540..9c0ae540 100644
--- a/libimagstore/src/toml_ext.rs
+++ b/lib/core/libimagstore/src/toml_ext.rs
diff --git a/libimagstore/src/util.rs b/lib/core/libimagstore/src/util.rs
index 51462ab1..51462ab1 100644
--- a/libimagstore/src/util.rs
+++ b/lib/core/libimagstore/src/util.rs
diff --git a/libimagbookmark/Cargo.toml b/lib/domain/libimagbookmark/Cargo.toml
index 1f271e4b..d81cb9d8 100644
--- a/libimagbookmark/Cargo.toml
+++ b/lib/domain/libimagbookmark/Cargo.toml
@@ -18,7 +18,7 @@ semver = "0.5"
url = "1.2"
regex = "0.1"
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimagentrylink = { version = "0.4.0", path = "../libimagentrylink" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagentrylink = { version = "0.4.0", path = "../../../lib/entry/libimagentrylink" }
diff --git a/libimagbookmark/README.md b/lib/domain/libimagbookmark/README.md
index f7c5cd05..f7c5cd05 120000
--- a/libimagbookmark/README.md
+++ b/lib/domain/libimagbookmark/README.md
diff --git a/libimagbookmark/src/collection.rs b/lib/domain/libimagbookmark/src/collection.rs
index 206e31cd..206e31cd 100644
--- a/libimagbookmark/src/collection.rs
+++ b/lib/domain/libimagbookmark/src/collection.rs
diff --git a/libimagbookmark/src/error.rs b/lib/domain/libimagbookmark/src/error.rs
index 9b52a169..9b52a169 100644
--- a/libimagbookmark/src/error.rs
+++ b/lib/domain/libimagbookmark/src/error.rs
diff --git a/libimagbookmark/src/lib.rs b/lib/domain/libimagbookmark/src/lib.rs
index e576ff1d..e576ff1d 100644
--- a/libimagbookmark/src/lib.rs
+++ b/lib/domain/libimagbookmark/src/lib.rs
diff --git a/libimagbookmark/src/link.rs b/lib/domain/libimagbookmark/src/link.rs
index 1da91c8a..1da91c8a 100644
--- a/libimagbookmark/src/link.rs
+++ b/lib/domain/libimagbookmark/src/link.rs
diff --git a/libimagbookmark/src/result.rs b/lib/domain/libimagbookmark/src/result.rs
index 780a8035..780a8035 100644
--- a/libimagbookmark/src/result.rs
+++ b/lib/domain/libimagbookmark/src/result.rs
diff --git a/libimagcounter/Cargo.toml b/lib/domain/libimagcounter/Cargo.toml
index ddc00880..01519e14 100644
--- a/libimagcounter/Cargo.toml
+++ b/lib/domain/libimagcounter/Cargo.toml
@@ -19,5 +19,5 @@ toml = "0.4.*"
toml-query = "0.3.*"
semver = "0.5"
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
diff --git a/libimagcounter/README.md b/lib/domain/libimagcounter/README.md
index 90221b8a..90221b8a 120000
--- a/libimagcounter/README.md
+++ b/lib/domain/libimagcounter/README.md
diff --git a/libimagcounter/src/counter.rs b/lib/domain/libimagcounter/src/counter.rs
index 7b6c1d3c..7b6c1d3c 100644
--- a/libimagcounter/src/counter.rs
+++ b/lib/domain/libimagcounter/src/counter.rs
diff --git a/libimagcounter/src/error.rs b/lib/domain/libimagcounter/src/error.rs
index c886d901..c886d901 100644
--- a/libimagcounter/src/error.rs
+++ b/lib/domain/libimagcounter/src/error.rs
diff --git a/libimagcounter/src/lib.rs b/lib/domain/libimagcounter/src/lib.rs
index 09ba1786..09ba1786 100644
--- a/libimagcounter/src/lib.rs
+++ b/lib/domain/libimagcounter/src/lib.rs
diff --git a/libimagcounter/src/result.rs b/lib/domain/libimagcounter/src/result.rs
index e24b90c9..e24b90c9 100644
--- a/libimagcounter/src/result.rs
+++ b/lib/domain/libimagcounter/src/result.rs
diff --git a/libimagdiary/Cargo.toml b/lib/domain/libimagdiary/Cargo.toml
index 2670b6b4..1da26c75 100644
--- a/libimagdiary/Cargo.toml
+++ b/lib/domain/libimagdiary/Cargo.toml
@@ -22,9 +22,9 @@ toml-query = "0.3.*"
regex = "0.1"
itertools = "0.5"
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimagutil = { version = "0.4.0", path = "../libimagutil" }
-libimagrt = { version = "0.4.0", path = "../libimagrt" }
-libimagentryedit = { version = "0.4.0", path = "../libimagentryedit" }
-libimagentryview = { version = "0.4.0", path = "../libimagentryview" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
+libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
+libimagentryedit = { version = "0.4.0", path = "../../../lib/entry/libimagentryedit" }
+libimagentryview = { version = "0.4.0", path = "../../../lib/entry/libimagentryview" }
diff --git a/libimagdiary/README.md b/lib/domain/libimagdiary/README.md
index 50c0ff34..50c0ff34 120000
--- a/libimagdiary/README.md
+++ b/lib/domain/libimagdiary/README.md
diff --git a/libimagdiary/src/config.rs b/lib/domain/libimagdiary/src/config.rs
index c2a6a980..c2a6a980 100644
--- a/libimagdiary/src/config.rs
+++ b/lib/domain/libimagdiary/src/config.rs
diff --git a/libimagdiary/src/diary.rs b/lib/domain/libimagdiary/src/diary.rs
index 431b6320..431b6320 100644
--- a/libimagdiary/src/diary.rs
+++ b/lib/domain/libimagdiary/src/diary.rs
diff --git a/libimagdiary/src/diaryid.rs b/lib/domain/libimagdiary/src/diaryid.rs
index da1afc42..da1afc42 100644
--- a/libimagdiary/src/diaryid.rs
+++ b/lib/domain/libimagdiary/src/diaryid.rs
diff --git a/libimagdiary/src/entry.rs b/lib/domain/libimagdiary/src/entry.rs
index 0148b59d..0148b59d 100644
--- a/libimagdiary/src/entry.rs
+++ b/lib/domain/libimagdiary/src/entry.rs
diff --git a/libimagdiary/src/error.rs b/lib/domain/libimagdiary/src/error.rs
index b5406b12..b5406b12 100644
--- a/libimagdiary/src/error.rs
+++ b/lib/domain/libimagdiary/src/error.rs
diff --git a/libimagdiary/src/is_in_diary.rs b/lib/domain/libimagdiary/src/is_in_diary.rs
index 09228072..09228072 100644
--- a/libimagdiary/src/is_in_diary.rs
+++ b/lib/domain/libimagdiary/src/is_in_diary.rs
diff --git a/libimagdiary/src/iter.rs b/lib/domain/libimagdiary/src/iter.rs
index de849872..de849872 100644
--- a/libimagdiary/src/iter.rs
+++ b/lib/domain/libimagdiary/src/iter.rs
diff --git a/libimagdiary/src/lib.rs b/lib/domain/libimagdiary/src/lib.rs
index fcabc94e..fcabc94e 100644
--- a/libimagdiary/src/lib.rs
+++ b/lib/domain/libimagdiary/src/lib.rs
diff --git a/libimagdiary/src/result.rs b/lib/domain/libimagdiary/src/result.rs
index b4f5f382..b4f5f382 100644
--- a/libimagdiary/src/result.rs
+++ b/lib/domain/libimagdiary/src/result.rs
diff --git a/libimagdiary/src/viewer.rs b/lib/domain/libimagdiary/src/viewer.rs
index 93b155a7..93b155a7 100644
--- a/libimagdiary/src/viewer.rs
+++ b/lib/domain/libimagdiary/src/viewer.rs
diff --git a/libimagmail/Cargo.toml b/lib/domain/libimagmail/Cargo.toml
index da7d9c85..98d245b3 100644
--- a/libimagmail/Cargo.toml
+++ b/lib/domain/libimagmail/Cargo.toml
@@ -20,6 +20,6 @@ semver = "0.5"
toml = "0.4.*"
filters = "0.1.*"
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimagref = { version = "0.4.0", path = "../libimagref" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagref = { version = "0.4.0", path = "../../../lib/entry/libimagentryref" }
diff --git a/libimagmail/README.md b/lib/domain/libimagmail/README.md
index d5d8fb01..d5d8fb01 120000
--- a/libimagmail/README.md
+++ b/lib/domain/libimagmail/README.md
diff --git a/libimagmail/src/error.rs b/lib/domain/libimagmail/src/error.rs
index 8c616fba..8c616fba 100644
--- a/libimagmail/src/error.rs
+++ b/lib/domain/libimagmail/src/error.rs
diff --git a/libimagmail/src/hasher.rs b/lib/domain/libimagmail/src/hasher.rs
index 8ea3f036..8ea3f036 100644
--- a/libimagmail/src/hasher.rs
+++ b/lib/domain/libimagmail/src/hasher.rs
diff --git a/libimagmail/src/iter.rs b/lib/domain/libimagmail/src/iter.rs
index 771d45a5..771d45a5 100644
--- a/libimagmail/src/iter.rs
+++ b/lib/domain/libimagmail/src/iter.rs
diff --git a/libimagmail/src/lib.rs b/lib/domain/libimagmail/src/lib.rs
index cc25d1f1..cc25d1f1 100644
--- a/libimagmail/src/lib.rs
+++ b/lib/domain/libimagmail/src/lib.rs
diff --git a/libimagmail/src/mail.rs b/lib/domain/libimagmail/src/mail.rs
index 6ee4d57a..6ee4d57a 100644
--- a/libimagmail/src/mail.rs
+++ b/lib/domain/libimagmail/src/mail.rs
diff --git a/libimagmail/src/result.rs b/lib/domain/libimagmail/src/result.rs
index 7f745eda..7f745eda 100644
--- a/libimagmail/src/result.rs
+++ b/lib/domain/libimagmail/src/result.rs
diff --git a/libimagnotes/Cargo.toml b/lib/domain/libimagnotes/Cargo.toml
index 83aea7c1..d3616cde 100644
--- a/libimagnotes/Cargo.toml
+++ b/lib/domain/libimagnotes/Cargo.toml
@@ -18,8 +18,8 @@ semver = "0.5"
log = "0.3"
toml = "^0.4"
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimagrt = { version = "0.4.0", path = "../libimagrt" }
-libimagentryedit = { version = "0.4.0", path = "../libimagentryedit" }
-libimagentrytag = { version = "0.4.0", path = "../libimagentrytag" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
+libimagentryedit = { version = "0.4.0", path = "../../../lib/entry/libimagentryedit" }
+libimagentrytag = { version = "0.4.0", path = "../../../lib/entry/libimagentrytag" }
diff --git a/libimagnotes/src/error.rs b/lib/domain/libimagnotes/src/error.rs
index 9fd51218..9fd51218 100644
--- a/libimagnotes/src/error.rs
+++ b/lib/domain/libimagnotes/src/error.rs
diff --git a/libimagnotes/src/lib.rs b/lib/domain/libimagnotes/src/lib.rs
index 10ef952b..10ef952b 100644
--- a/libimagnotes/src/lib.rs
+++ b/lib/domain/libimagnotes/src/lib.rs
diff --git a/libimagnotes/src/note.rs b/lib/domain/libimagnotes/src/note.rs
index cc50bab8..cc50bab8 100644
--- a/libimagnotes/src/note.rs
+++ b/lib/domain/libimagnotes/src/note.rs
diff --git a/libimagnotes/src/result.rs b/lib/domain/libimagnotes/src/result.rs
index a11ba895..a11ba895 100644
--- a/libimagnotes/src/result.rs
+++ b/lib/domain/libimagnotes/src/result.rs
diff --git a/libimagtodo/Cargo.toml b/lib/domain/libimagtodo/Cargo.toml
index 706bc680..65b4ee26 100644
--- a/libimagtodo/Cargo.toml
+++ b/lib/domain/libimagtodo/Cargo.toml
@@ -23,6 +23,6 @@ is-match = "0.1.*"
log = "0.3"
serde_json = "0.8"
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimagutil = { version = "0.4.0", path = "../libimagutil" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
diff --git a/libimagtodo/src/error.rs b/lib/domain/libimagtodo/src/error.rs
index c19a6e52..c19a6e52 100644
--- a/libimagtodo/src/error.rs
+++ b/lib/domain/libimagtodo/src/error.rs
diff --git a/libimagtodo/src/lib.rs b/lib/domain/libimagtodo/src/lib.rs
index 16fcc11b..16fcc11b 100644
--- a/libimagtodo/src/lib.rs
+++ b/lib/domain/libimagtodo/src/lib.rs
diff --git a/libimagtodo/src/result.rs b/lib/domain/libimagtodo/src/result.rs
index 7962851c..7962851c 100644
--- a/libimagtodo/src/result.rs
+++ b/lib/domain/libimagtodo/src/result.rs
diff --git a/libimagtodo/src/task.rs b/lib/domain/libimagtodo/src/task.rs
index 5e31d952..5e31d952 100644
--- a/libimagtodo/src/task.rs
+++ b/lib/domain/libimagtodo/src/task.rs
diff --git a/lib/entry/libimagentryannotation/Cargo.toml b/lib/entry/libimagentryannotation/Cargo.toml
new file mode 100644
index 00000000..1b8716fb
--- /dev/null
+++ b/lib/entry/libimagentryannotation/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "libimagannotation"
+version = "0.4.0"
+authors = ["Matthias Beyer <mail@beyermatthias.de>"]
+
+description = "Library for the imag core distribution"
+
+keywords = ["imag", "PIM", "personal", "information", "management"]
+readme = "../README.md"
+license = "LGPL-2.1"
+
+[dependencies]
+uuid = { version = "0.3.1", features = ["v4"] }
+lazy_static = "0.1.15"
+toml = "^0.4"
+
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagnotes = { version = "0.4.0", path = "../../../lib/domain/libimagnotes" }
+libimagentrylink = { version = "0.4.0", path = "../../../lib/entry/libimagentrylink" }
+libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
diff --git a/libimagannotation/README.md b/lib/entry/libimagentryannotation/README.md
index 5c4afa4a..5c4afa4a 120000
--- a/libimagannotation/README.md
+++ b/lib/entry/libimagentryannotation/README.md
diff --git a/libimagannotation/src/annotateable.rs b/lib/entry/libimagentryannotation/src/annotateable.rs
index 8827916a..8827916a 100644
--- a/libimagannotation/src/annotateable.rs
+++ b/lib/entry/libimagentryannotation/src/annotateable.rs
diff --git a/libimagannotation/src/annotation_fetcher.rs b/lib/entry/libimagentryannotation/src/annotation_fetcher.rs
index 18c4a8be..18c4a8be 100644
--- a/libimagannotation/src/annotation_fetcher.rs
+++ b/lib/entry/libimagentryannotation/src/annotation_fetcher.rs
diff --git a/libimagannotation/src/error.rs b/lib/entry/libimagentryannotation/src/error.rs
index 25fc0048..25fc0048 100644
--- a/libimagannotation/src/error.rs
+++ b/lib/entry/libimagentryannotation/src/error.rs
diff --git a/libimagannotation/src/lib.rs b/lib/entry/libimagentryannotation/src/lib.rs
index 0cb4e779..0cb4e779 100644
--- a/libimagannotation/src/lib.rs
+++ b/lib/entry/libimagentryannotation/src/lib.rs
diff --git a/libimagannotation/src/result.rs b/lib/entry/libimagentryannotation/src/result.rs
index 292fc0e5..292fc0e5 100644
--- a/libimagannotation/src/result.rs
+++ b/lib/entry/libimagentryannotation/src/result.rs
diff --git a/libimagentrycategory/Cargo.toml b/lib/entry/libimagentrycategory/Cargo.toml
index 6c8b9dfb..d3f16185 100644
--- a/libimagentrycategory/Cargo.toml
+++ b/lib/entry/libimagentrycategory/Cargo.toml
@@ -19,8 +19,8 @@ toml = "0.4"
toml-query = "0.3"
is-match = "0.1"
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
[dev-dependencies]
env_logger = "0.4"
diff --git a/libimagentrycategory/src/category.rs b/lib/entry/libimagentrycategory/src/category.rs
index 1e77495e..1e77495e 100644
--- a/libimagentrycategory/src/category.rs
+++ b/lib/entry/libimagentrycategory/src/category.rs
diff --git a/libimagentrycategory/src/error.rs b/lib/entry/libimagentrycategory/src/error.rs
index 72824337..72824337 100644
--- a/libimagentrycategory/src/error.rs
+++ b/lib/entry/libimagentrycategory/src/error.rs
diff --git a/libimagentrycategory/src/lib.rs b/lib/entry/libimagentrycategory/src/lib.rs
index 8ffaafc7..8ffaafc7 100644
--- a/libimagentrycategory/src/lib.rs
+++ b/lib/entry/libimagentrycategory/src/lib.rs
diff --git a/libimagentrycategory/src/register.rs b/lib/entry/libimagentrycategory/src/register.rs
index e8853631..e8853631 100644
--- a/libimagentrycategory/src/register.rs
+++ b/lib/entry/libimagentrycategory/src/register.rs
diff --git a/libimagentrycategory/src/result.rs b/lib/entry/libimagentrycategory/src/result.rs
index 517d0e96..517d0e96 100644
--- a/libimagentrycategory/src/result.rs
+++ b/lib/entry/libimagentrycategory/src/result.rs
diff --git a/libimagentrydatetime/Cargo.toml b/lib/entry/libimagentrydatetime/Cargo.toml
index 4885af11..93e43b8c 100644
--- a/libimagentrydatetime/Cargo.toml
+++ b/lib/entry/libimagentrydatetime/Cargo.toml
@@ -19,9 +19,9 @@ toml-query = "0.3"
lazy_static = "0.2"
toml = "0.4"
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagutil = { version = "0.4.0", path = "../libimagutil" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
[dev-dependencies]
is-match = "0.1"
diff --git a/libimagentrydatetime/src/datepath/accuracy.rs b/lib/entry/libimagentrydatetime/src/datepath/accuracy.rs
index 47299c14..47299c14 100644
--- a/libimagentrydatetime/src/datepath/accuracy.rs
+++ b/lib/entry/libimagentrydatetime/src/datepath/accuracy.rs
diff --git a/libimagentrydatetime/src/datepath/compiler.rs b/lib/entry/libimagentrydatetime/src/datepath/compiler.rs
index 742b594a..742b594a 100644
--- a/libimagentrydatetime/src/datepath/compiler.rs
+++ b/lib/entry/libimagentrydatetime/src/datepath/compiler.rs
diff --git a/libimagentrydatetime/src/datepath/error.rs b/lib/entry/libimagentrydatetime/src/datepath/error.rs
index 1a163208..1a163208 100644
--- a/libimagentrydatetime/src/datepath/error.rs
+++ b/lib/entry/libimagentrydatetime/src/datepath/error.rs
diff --git a/libimagentrydatetime/src/datepath/format.rs b/lib/entry/libimagentrydatetime/src/datepath/format.rs
index cc9e8c77..cc9e8c77 100644
--- a/libimagentrydatetime/src/datepath/format.rs
+++ b/lib/entry/libimagentrydatetime/src/datepath/format.rs
diff --git a/libimagentrydatetime/src/datepath/mod.rs b/lib/entry/libimagentrydatetime/src/datepath/mod.rs
index c964abf9..c964abf9 100644
--- a/libimagentrydatetime/src/datepath/mod.rs
+++ b/lib/entry/libimagentrydatetime/src/datepath/mod.rs
diff --git a/libimagentrydatetime/src/datepath/result.rs b/lib/entry/libimagentrydatetime/src/datepath/result.rs
index 2fc3350a..2fc3350a 100644
--- a/libimagentrydatetime/src/datepath/result.rs
+++ b/lib/entry/libimagentrydatetime/src/datepath/result.rs
diff --git a/libimagentrydatetime/src/datepath/to_store_id.rs b/lib/entry/libimagentrydatetime/src/datepath/to_store_id.rs
index c781595b..c781595b 100644
--- a/libimagentrydatetime/src/datepath/to_store_id.rs
+++ b/lib/entry/libimagentrydatetime/src/datepath/to_store_id.rs
diff --git a/libimagentrydatetime/src/datetime.rs b/lib/entry/libimagentrydatetime/src/datetime.rs
index 73c29622..73c29622 100644
--- a/libimagentrydatetime/src/datetime.rs
+++ b/lib/entry/libimagentrydatetime/src/datetime.rs
diff --git a/libimagentrydatetime/src/error.rs b/lib/entry/libimagentrydatetime/src/error.rs
index 0f0166a0..0f0166a0 100644
--- a/libimagentrydatetime/src/error.rs
+++ b/lib/entry/libimagentrydatetime/src/error.rs
diff --git a/libimagentrydatetime/src/lib.rs b/lib/entry/libimagentrydatetime/src/lib.rs
index fb0d73fa..fb0d73fa 100644
--- a/libimagentrydatetime/src/lib.rs
+++ b/lib/entry/libimagentrydatetime/src/lib.rs
diff --git a/libimagentrydatetime/src/range.rs b/lib/entry/libimagentrydatetime/src/range.rs
index 8820b7a3..8820b7a3 100644
--- a/libimagentrydatetime/src/range.rs
+++ b/lib/entry/libimagentrydatetime/src/range.rs
diff --git a/libimagentrydatetime/src/result.rs b/lib/entry/libimagentrydatetime/src/result.rs
index d6d0a5af..d6d0a5af 100644
--- a/libimagentrydatetime/src/result.rs
+++ b/lib/entry/libimagentrydatetime/src/result.rs
diff --git a/libimagentryedit/Cargo.toml b/lib/entry/libimagentryedit/Cargo.toml
index 56313daa..ae241d2c 100644
--- a/libimagentryedit/Cargo.toml
+++ b/lib/entry/libimagentryedit/Cargo.toml
@@ -15,7 +15,7 @@ homepage = "http://imag-pim.org"
[dependencies]
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimagrt = { version = "0.4.0", path = "../libimagrt" }
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagutil = { version = "0.4.0", path = "../libimagutil" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
diff --git a/libimagentryedit/src/edit.rs b/lib/entry/libimagentryedit/src/edit.rs
index cbd17733..cbd17733 100644
--- a/libimagentryedit/src/edit.rs
+++ b/lib/entry/libimagentryedit/src/edit.rs
diff --git a/libimagentryedit/src/error.rs b/lib/entry/libimagentryedit/src/error.rs
index 478d5d2c..478d5d2c 100644
--- a/libimagentryedit/src/error.rs
+++ b/lib/entry/libimagentryedit/src/error.rs
diff --git a/libimagentryedit/src/lib.rs b/lib/entry/libimagentryedit/src/lib.rs
index 00013d5e..00013d5e 100644
--- a/libimagentryedit/src/lib.rs
+++ b/lib/entry/libimagentryedit/src/lib.rs
diff --git a/libimagentryedit/src/result.rs b/lib/entry/libimagentryedit/src/result.rs
index 1d917c05..1d917c05 100644
--- a/libimagentryedit/src/result.rs
+++ b/lib/entry/libimagentryedit/src/result.rs
diff --git a/libimagentryfilter/Cargo.toml b/lib/entry/libimagentryfilter/Cargo.toml
index f20b33b6..decdc730 100644
--- a/libimagentryfilter/Cargo.toml
+++ b/lib/entry/libimagentryfilter/Cargo.toml
@@ -22,5 +22,5 @@ regex = "0.2"
semver = "0.5.*"
toml = "^0.4"
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagentrytag = { version = "0.4.0", path = "../libimagentrytag" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagentrytag = { version = "0.4.0", path = "../../../lib/entry/libimagentrytag" }
diff --git a/libimagentryfilter/README.md b/lib/entry/libimagentryfilter/README.md
index 505ed66f..505ed66f 120000
--- a/libimagentryfilter/README.md
+++ b/lib/entry/libimagentryfilter/README.md
diff --git a/libimagentryfilter/src/builtin/bool_filter.rs b/lib/entry/libimagentryfilter/src/builtin/bool_filter.rs
index e903e341..e903e341 100644
--- a/libimagentryfilter/src/builtin/bool_filter.rs
+++ b/lib/entry/libimagentryfilter/src/builtin/bool_filter.rs
diff --git a/libimagentryfilter/src/builtin/content/grep.rs b/lib/entry/libimagentryfilter/src/builtin/content/grep.rs
index 02039fba..02039fba 100644
--- a/libimagentryfilter/src/builtin/content/grep.rs
+++ b/lib/entry/libimagentryfilter/src/builtin/content/grep.rs
diff --git a/libimagentryfilter/src/builtin/content/length/is_over.rs b/lib/entry/libimagentryfilter/src/builtin/content/length/is_over.rs
index 96f22da4..96f22da4 100644
--- a/libimagentryfilter/src/builtin/content/length/is_over.rs
+++ b/lib/entry/libimagentryfilter/src/builtin/content/length/is_over.rs
diff --git a/libimagentryfilter/src/builtin/content/length/is_under.rs b/lib/entry/libimagentryfilter/src/builtin/content/length/is_under.rs
index a365438e..a365438e 100644
--- a/libimagentryfilter/src/builtin/content/length/is_under.rs
+++ b/lib/entry/libimagentryfilter/src/builtin/content/length/is_under.rs
diff --git a/libimagentryfilter/src/builtin/content/length/mod.rs b/lib/entry/libimagentryfilter/src/builtin/content/length/mod.rs
index 2ebb18cb..2ebb18cb 100644
--- a/libimagentryfilter/src/builtin/content/length/mod.rs
+++ b/lib/entry/libimagentryfilter/src/builtin/content/length/mod.rs
diff --git a/libimagentryfilter/src/builtin/content/mod.rs b/lib/entry/libimagentryfilter/src/builtin/content/mod.rs
index 2ccbdf66..2ccbdf66 100644
--- a/libimagentryfilter/src/builtin/content/mod.rs
+++ b/lib/entry/libimagentryfilter/src/builtin/content/mod.rs
diff --git a/libimagentryfilter/src/builtin/header/field_eq.rs b/lib/entry/libimagentryfilter/src/builtin/header/field_eq.rs
index f10f3d0f..f10f3d0f 100644
--- a/libimagentryfilter/src/builtin/header/field_eq.rs
+++ b/lib/entry/libimagentryfilter/src/builtin/header/field_eq.rs
diff --git a/libimagentryfilter/src/builtin/header/field_exists.rs b/lib/entry/libimagentryfilter/src/builtin/header/field_exists.rs
index 5fe672da..5fe672da 100644
--- a/libimagentryfilter/src/builtin/header/field_exists.rs
+++ b/lib/entry/libimagentryfilter/src/builtin/header/field_exists.rs
diff --git a/libimagentryfilter/src/builtin/header/field_grep.rs b/lib/entry/libimagentryfilter/src/builtin/header/field_grep.rs
index 799fee68..799fee68 100644
--- a/libimagentryfilter/src/builtin/header/field_grep.rs
+++ b/lib/entry/libimagentryfilter/src/builtin/header/field_grep.rs
diff --git a/libimagentryfilter/src/builtin/header/field_gt.rs b/lib/entry/libimagentryfilter/src/builtin/header/field_gt.rs
index 2c1bcf89..2c1bcf89 100644
--- a/libimagentryfilter/src/builtin/header/field_gt.rs
+++ b/lib/entry/libimagentryfilter/src/builtin/header/field_gt.rs
diff --git a/libimagentryfilter/src/builtin/header/field_isempty.rs b/lib/entry/libimagentryfilter/src/builtin/header/field_isempty.rs
index 7a9c6521..7a9c6521 100644
--- a/libimagentryfilter/src/builtin/header/field_isempty.rs
+++ b/lib/entry/libimagentryfilter/src/builtin/header/field_isempty.rs
diff --git a/libimagentryfilter/src/builtin/header/field_istype.rs b/lib/entry/libimagentryfilter/src/builtin/header/field_istype.rs
index 889c8321..889c8321 100644
--- a/libimagentryfilter/src/builtin/header/field_istype.rs
+++ b/lib/entry/libimagentryfilter/src/builtin/header/field_istype.rs
diff --git a/libimagentryfilter/src/builtin/header/field_lt.rs b/lib/entry/libimagentryfilter/src/builtin/header/field_lt.rs
index 0316bf82..0316bf82 100644
--- a/libimagentryfilter/src/builtin/header/field_lt.rs
+++ b/lib/entry/libimagentryfilter/src/builtin/header/field_lt.rs
diff --git a/libimagentryfilter/src/builtin/header/field_path.rs b/lib/entry/libimagentryfilter/src/builtin/header/field_path.rs
index 42ba65aa..42ba65aa 100644
--- a/libimagentryfilter/src/builtin/header/field_path.rs
+++ b/lib/entry/libimagentryfilter/src/builtin/header/field_path.rs
diff --git a/libimagentryfilter/src/builtin/header/field_predicate.rs b/lib/entry/libimagentryfilter/src/builtin/header/field_predicate.rs
index 45aa332c..45aa332c 100644
--- a/libimagentryfilter/src/builtin/header/field_predicate.rs
+++ b/lib/entry/libimagentryfilter/src/builtin/header/field_predicate.rs
diff --git a/libimagentryfilter/src/builtin/header/mod.rs b/lib/entry/libimagentryfilter/src/builtin/header/mod.rs
index cb363c24..cb363c24 100644
--- a/libimagentryfilter/src/builtin/header/mod.rs
+++ b/lib/entry/libimagentryfilter/src/builtin/header/mod.rs
diff --git a/libimagentryfilter/src/builtin/header/version/eq.rs b/lib/entry/libimagentryfilter/src/builtin/header/version/eq.rs
index 1ca38f8b..1ca38f8b 100644
--- a/libimagentryfilter/src/builtin/header/version/eq.rs
+++ b/lib/entry/libimagentryfilter/src/builtin/header/version/eq.rs
diff --git a/libimagentryfilter/src/builtin/header/version/gt.rs b/lib/entry/libimagentryfilter/src/builtin/header/version/gt.rs
index 8e3873fb..8e3873fb 100644
--- a/libimagentryfilter/src/builtin/header/version/gt.rs
+++ b/lib/entry/libimagentryfilter/src/builtin/header/version/gt.rs
diff --git a/libimagentryfilter/src/builtin/header/version/lt.rs b/lib/entry/libimagentryfilter/src/builtin/header/version/lt.rs
index c475b436..c475b436 100644
--- a/libimagentryfilter/src/builtin/header/version/lt.rs
+++ b/lib/entry/libimagentryfilter/src/builtin/header/version/lt.rs
diff --git a/libimagentryfilter/src/builtin/header/version/mod.rs b/lib/entry/libimagentryfilter/src/builtin/header/version/mod.rs
index e214e329..e214e329 100644
--- a/libimagentryfilter/src/builtin/header/version/mod.rs
+++ b/lib/entry/libimagentryfilter/src/builtin/header/version/mod.rs
diff --git a/libimagentryfilter/src/builtin/header/version/range.rs b/lib/entry/libimagentryfilter/src/builtin/header/version/range.rs
index 59f3a1d5..59f3a1d5 100644
--- a/libimagentryfilter/src/builtin/header/version/range.rs
+++ b/lib/entry/libimagentryfilter/src/builtin/header/version/range.rs
diff --git a/libimagentryfilter/src/builtin/mod.rs b/lib/entry/libimagentryfilter/src/builtin/mod.rs
index 68c819bc..68c819bc 100644
--- a/libimagentryfilter/src/builtin/mod.rs
+++ b/lib/entry/libimagentryfilter/src/builtin/mod.rs
diff --git a/libimagentryfilter/src/cli.rs b/lib/entry/libimagentryfilter/src/cli.rs
index ee8b8381..ee8b8381 100644
--- a/libimagentryfilter/src/cli.rs
+++ b/lib/entry/libimagentryfilter/src/cli.rs
diff --git a/libimagentryfilter/src/lib.rs b/lib/entry/libimagentryfilter/src/lib.rs
index ad99db60..ad99db60 100644
--- a/libimagentryfilter/src/lib.rs
+++ b/lib/entry/libimagentryfilter/src/lib.rs
diff --git a/libimagentryfilter/src/tags/mod.rs b/lib/entry/libimagentryfilter/src/tags/mod.rs
index cef11e5e..cef11e5e 100644
--- a/libimagentryfilter/src/tags/mod.rs
+++ b/lib/entry/libimagentryfilter/src/tags/mod.rs
diff --git a/libimagentrylink/Cargo.toml b/lib/entry/libimagentrylink/Cargo.toml
index 451a0eb9..32e86873 100644
--- a/libimagentrylink/Cargo.toml
+++ b/lib/entry/libimagentrylink/Cargo.toml
@@ -23,6 +23,6 @@ rust-crypto = "0.2"
env_logger = "0.3"
is-match = "0.1"
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimagutil = { version = "0.4.0", path = "../libimagutil" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
diff --git a/libimagentrylink/README.md b/lib/entry/libimagentrylink/README.md
index d30d8ab6..d30d8ab6 120000
--- a/libimagentrylink/README.md
+++ b/lib/entry/libimagentrylink/README.md
diff --git a/libimagentrylink/src/error.rs b/lib/entry/libimagentrylink/src/error.rs
index 10d83f94..10d83f94 100644
--- a/libimagentrylink/src/error.rs
+++ b/lib/entry/libimagentrylink/src/error.rs
diff --git a/libimagentrylink/src/external.rs b/lib/entry/libimagentrylink/src/external.rs
index daed7a12..daed7a12 100644
--- a/libimagentrylink/src/external.rs
+++ b/lib/entry/libimagentrylink/src/external.rs
diff --git a/libimagentrylink/src/internal.rs b/lib/entry/libimagentrylink/src/internal.rs
index 62003777..62003777 100644
--- a/libimagentrylink/src/internal.rs
+++ b/lib/entry/libimagentrylink/src/internal.rs
diff --git a/libimagentrylink/src/lib.rs b/lib/entry/libimagentrylink/src/lib.rs
index 2ed8b6ba..2ed8b6ba 100644
--- a/libimagentrylink/src/lib.rs
+++ b/lib/entry/libimagentrylink/src/lib.rs
diff --git a/libimagentrylink/src/result.rs b/lib/entry/libimagentrylink/src/result.rs
index 23e50363..23e50363 100644
--- a/libimagentrylink/src/result.rs
+++ b/lib/entry/libimagentrylink/src/result.rs
diff --git a/libimagentrylist/Cargo.toml b/lib/entry/libimagentrylist/Cargo.toml
index 832f68d9..c28354da 100644
--- a/libimagentrylist/Cargo.toml
+++ b/lib/entry/libimagentrylist/Cargo.toml
@@ -19,6 +19,6 @@ log = "0.3"
toml = "^0.4"
prettytable-rs = "0.6.*"
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimagutil = { version = "0.4.0", path = "../libimagutil" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
diff --git a/libimagentrylist/README.md b/lib/entry/libimagentrylist/README.md
index 7fd3298b..7fd3298b 120000
--- a/libimagentrylist/README.md
+++ b/lib/entry/libimagentrylist/README.md
diff --git a/libimagentrylist/src/cli.rs b/lib/entry/libimagentrylist/src/cli.rs
index b52a92fd..b52a92fd 100644
--- a/libimagentrylist/src/cli.rs
+++ b/lib/entry/libimagentrylist/src/cli.rs
diff --git a/libimagentrylist/src/error.rs b/lib/entry/libimagentrylist/src/error.rs
index 9c3b1ccc..9c3b1ccc 100644
--- a/libimagentrylist/src/error.rs
+++ b/lib/entry/libimagentrylist/src/error.rs
diff --git a/libimagentrylist/src/lib.rs b/lib/entry/libimagentrylist/src/lib.rs
index ee97d72c..ee97d72c 100644
--- a/libimagentrylist/src/lib.rs
+++ b/lib/entry/libimagentrylist/src/lib.rs
diff --git a/libimagentrylist/src/lister.rs b/lib/entry/libimagentrylist/src/lister.rs
index 798061b8..798061b8 100644
--- a/libimagentrylist/src/lister.rs
+++ b/lib/entry/libimagentrylist/src/lister.rs
diff --git a/libimagentrylist/src/listers/core.rs b/lib/entry/libimagentrylist/src/listers/core.rs
index 733ba719..733ba719 100644
--- a/libimagentrylist/src/listers/core.rs
+++ b/lib/entry/libimagentrylist/src/listers/core.rs
diff --git a/libimagentrylist/src/listers/line.rs b/lib/entry/libimagentrylist/src/listers/line.rs
index 8c439934..8c439934 100644
--- a/libimagentrylist/src/listers/line.rs
+++ b/lib/entry/libimagentrylist/src/listers/line.rs
diff --git a/libimagentrylist/src/listers/mod.rs b/lib/entry/libimagentrylist/src/listers/mod.rs
index 78a6e8f7..78a6e8f7 100644
--- a/libimagentrylist/src/listers/mod.rs
+++ b/lib/entry/libimagentrylist/src/listers/mod.rs
diff --git a/libimagentrylist/src/listers/path.rs b/lib/entry/libimagentrylist/src/listers/path.rs
index 15a2df5b..15a2df5b 100644
--- a/libimagentrylist/src/listers/path.rs
+++ b/lib/entry/libimagentrylist/src/listers/path.rs
diff --git a/libimagentrylist/src/listers/table.rs b/lib/entry/libimagentrylist/src/listers/table.rs
index e9358ce3..e9358ce3 100644
--- a/libimagentrylist/src/listers/table.rs
+++ b/lib/entry/libimagentrylist/src/listers/table.rs
diff --git a/libimagentrylist/src/result.rs b/lib/entry/libimagentrylist/src/result.rs
index e29d7d34..e29d7d34 100644
--- a/libimagentrylist/src/result.rs
+++ b/lib/entry/libimagentrylist/src/result.rs
diff --git a/libimagentrymarkdown/Cargo.toml b/lib/entry/libimagentrymarkdown/Cargo.toml
index 4014d86c..5951f36a 100644
--- a/libimagentrymarkdown/Cargo.toml
+++ b/lib/entry/libimagentrymarkdown/Cargo.toml
@@ -19,6 +19,6 @@ hoedown = "5.0.0"
crossbeam = "0.2"
url = "1.2"
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
diff --git a/libimagentrymarkdown/README.md b/lib/entry/libimagentrymarkdown/README.md
index 617d7006..617d7006 120000
--- a/libimagentrymarkdown/README.md
+++ b/lib/entry/libimagentrymarkdown/README.md
diff --git a/libimagentrymarkdown/src/error.rs b/lib/entry/libimagentrymarkdown/src/error.rs
index 1186d5f3..1186d5f3 100644
--- a/libimagentrymarkdown/src/error.rs
+++ b/lib/entry/libimagentrymarkdown/src/error.rs
diff --git a/libimagentrymarkdown/src/html.rs b/lib/entry/libimagentrymarkdown/src/html.rs
index 1fcd12c7..1fcd12c7 100644
--- a/libimagentrymarkdown/src/html.rs
+++ b/lib/entry/libimagentrymarkdown/src/html.rs
diff --git a/libimagentrymarkdown/src/lib.rs b/lib/entry/libimagentrymarkdown/src/lib.rs
index 2efc6094..2efc6094 100644
--- a/libimagentrymarkdown/src/lib.rs
+++ b/lib/entry/libimagentrymarkdown/src/lib.rs
diff --git a/libimagentrymarkdown/src/link.rs b/lib/entry/libimagentrymarkdown/src/link.rs
index 9f13fe65..9f13fe65 100644
--- a/libimagentrymarkdown/src/link.rs
+++ b/lib/entry/libimagentrymarkdown/src/link.rs
diff --git a/libimagentrymarkdown/src/result.rs b/lib/entry/libimagentrymarkdown/src/result.rs
index f00a3122..f00a3122 100644
--- a/libimagentrymarkdown/src/result.rs
+++ b/lib/entry/libimagentrymarkdown/src/result.rs
diff --git a/libimagref/Cargo.toml b/lib/entry/libimagentryref/Cargo.toml
index 50472519..7b7763e8 100644
--- a/libimagref/Cargo.toml
+++ b/lib/entry/libimagentryref/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "libimagref"
+name = "libimagentryref"
version = "0.4.0"
authors = ["Matthias Beyer <mail@beyermatthias.de>"]
@@ -22,7 +22,7 @@ toml = "^0.4"
version = "2.0.1"
walkdir = "1.0.*"
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimagutil = { version = "0.4.0", path = "../libimagutil" }
-libimagentrylist = { version = "0.4.0", path = "../libimagentrylist" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagentrylist = { version = "0.4.0", path = "../../../lib/entry/libimagentrylist" }
+libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
diff --git a/libimagref/README.md b/lib/entry/libimagentryref/README.md
index a2b1195d..a2b1195d 120000
--- a/libimagref/README.md
+++ b/lib/entry/libimagentryref/README.md
diff --git a/libimagref/src/error.rs b/lib/entry/libimagentryref/src/error.rs
index 56c1e869..56c1e869 100644
--- a/libimagref/src/error.rs
+++ b/lib/entry/libimagentryref/src/error.rs
diff --git a/libimagref/src/flags.rs b/lib/entry/libimagentryref/src/flags.rs
index 6ddf2990..6ddf2990 100644
--- a/libimagref/src/flags.rs
+++ b/lib/entry/libimagentryref/src/flags.rs
diff --git a/libimagref/src/hasher.rs b/lib/entry/libimagentryref/src/hasher.rs
index d29502d2..d29502d2 100644
--- a/libimagref/src/hasher.rs
+++ b/lib/entry/libimagentryref/src/hasher.rs
diff --git a/libimagref/src/hashers/mod.rs b/lib/entry/libimagentryref/src/hashers/mod.rs
index eaa8de3f..eaa8de3f 100644
--- a/libimagref/src/hashers/mod.rs
+++ b/lib/entry/libimagentryref/src/hashers/mod.rs
diff --git a/libimagref/src/hashers/nbytes.rs b/lib/entry/libimagentryref/src/hashers/nbytes.rs
index 995e3dd8..995e3dd8 100644
--- a/libimagref/src/hashers/nbytes.rs
+++ b/lib/entry/libimagentryref/src/hashers/nbytes.rs
diff --git a/libimagref/src/lib.rs b/lib/entry/libimagentryref/src/lib.rs
index 86c187d0..86c187d0 100644
--- a/libimagref/src/lib.rs
+++ b/lib/entry/libimagentryref/src/lib.rs
diff --git a/libimagref/src/lister.rs b/lib/entry/libimagentryref/src/lister.rs
index 662ea9f6..662ea9f6 100644
--- a/libimagref/src/lister.rs
+++ b/lib/entry/libimagentryref/src/lister.rs
diff --git a/libimagref/src/reference.rs b/lib/entry/libimagentryref/src/reference.rs
index e860452e..e860452e 100644
--- a/libimagref/src/reference.rs
+++ b/lib/entry/libimagentryref/src/reference.rs
diff --git a/libimagref/src/result.rs b/lib/entry/libimagentryref/src/result.rs
index eefcec65..eefcec65 100644
--- a/libimagref/src/result.rs
+++ b/lib/entry/libimagentryref/src/result.rs
diff --git a/libimagentrytag/Cargo.toml b/lib/entry/libimagentrytag/Cargo.toml
index 1c2cd472..a58b33d0 100644
--- a/libimagentrytag/Cargo.toml
+++ b/lib/entry/libimagentrytag/Cargo.toml
@@ -22,6 +22,6 @@ itertools = "0.5"
is-match = "0.1"
filters = "0.1"
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimagutil = { version = "0.4.0", path = "../libimagutil" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
diff --git a/libimagentrytag/README.md b/lib/entry/libimagentrytag/README.md
index bb2c4ed4..bb2c4ed4 120000
--- a/libimagentrytag/README.md
+++ b/lib/entry/libimagentrytag/README.md
diff --git a/libimagentrytag/src/error.rs b/lib/entry/libimagentrytag/src/error.rs
index 579e3ce8..579e3ce8 100644
--- a/libimagentrytag/src/error.rs
+++ b/lib/entry/libimagentrytag/src/error.rs
diff --git a/libimagentrytag/src/exec.rs b/lib/entry/libimagentrytag/src/exec.rs
index 216e2c28..216e2c28 100644
--- a/libimagentrytag/src/exec.rs
+++ b/lib/entry/libimagentrytag/src/exec.rs
diff --git a/libimagentrytag/src/lib.rs b/lib/entry/libimagentrytag/src/lib.rs
index bfc4d461..bfc4d461 100644
--- a/libimagentrytag/src/lib.rs
+++ b/lib/entry/libimagentrytag/src/lib.rs
diff --git a/libimagentrytag/src/result.rs b/lib/entry/libimagentrytag/src/result.rs
index 02d72766..02d72766 100644
--- a/libimagentrytag/src/result.rs
+++ b/lib/entry/libimagentrytag/src/result.rs
diff --git a/libimagentrytag/src/tag.rs b/lib/entry/libimagentrytag/src/tag.rs
index be968da7..be968da7 100644
--- a/libimagentrytag/src/tag.rs
+++ b/lib/entry/libimagentrytag/src/tag.rs
diff --git a/libimagentrytag/src/tagable.rs b/lib/entry/libimagentrytag/src/tagable.rs
index bd53a122..bd53a122 100644
--- a/libimagentrytag/src/tagable.rs
+++ b/lib/entry/libimagentrytag/src/tagable.rs
diff --git a/libimagentrytag/src/ui.rs b/lib/entry/libimagentrytag/src/ui.rs
index 734708b3..734708b3 100644
--- a/libimagentrytag/src/ui.rs
+++ b/lib/entry/libimagentrytag/src/ui.rs
diff --git a/libimagentrytimetrack/Cargo.toml b/lib/entry/libimagentrytimetrack/Cargo.toml
index 578da442..21e3aecc 100644
--- a/libimagentrytimetrack/Cargo.toml
+++ b/lib/entry/libimagentrytimetrack/Cargo.toml
@@ -21,7 +21,7 @@ toml-query = "0.3"
lazy_static = "0.2"
is-match = "0.1"
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagentrydatetime = { version = "0.4.0", path = "../libimagentrydatetime" }
-libimagentrytag = { version = "0.4.0", path = "../libimagentrytag" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagentrydatetime = { version = "0.4.0", path = "../../../lib/entry/libimagentrydatetime" }
+libimagentrytag = { version = "0.4.0", path = "../../../lib/entry/libimagentrytag" }
diff --git a/libimagentrytimetrack/README.md b/lib/entry/libimagentrytimetrack/README.md
index 1a80613d..1a80613d 120000
--- a/libimagentrytimetrack/README.md
+++ b/lib/entry/libimagentrytimetrack/README.md
diff --git a/libimagentrytimetrack/src/constants.rs b/lib/entry/libimagentrytimetrack/src/constants.rs
index 63eeaf64..63eeaf64 100644
--- a/libimagentrytimetrack/src/constants.rs
+++ b/lib/entry/libimagentrytimetrack/src/constants.rs
diff --git a/libimagentrytimetrack/src/error.rs b/lib/entry/libimagentrytimetrack/src/error.rs
index 3ac4a11a..3ac4a11a 100644
--- a/libimagentrytimetrack/src/error.rs
+++ b/lib/entry/libimagentrytimetrack/src/error.rs
diff --git a/libimagentrytimetrack/src/iter/create.rs b/lib/entry/libimagentrytimetrack/src/iter/create.rs
index 0c471aa8..0c471aa8 100644
--- a/libimagentrytimetrack/src/iter/create.rs
+++ b/lib/entry/libimagentrytimetrack/src/iter/create.rs
diff --git a/libimagentrytimetrack/src/iter/filter.rs b/lib/entry/libimagentrytimetrack/src/iter/filter.rs
index 0a3ae538..0a3ae538 100644
--- a/libimagentrytimetrack/src/iter/filter.rs
+++ b/lib/entry/libimagentrytimetrack/src/iter/filter.rs
diff --git a/libimagentrytimetrack/src/iter/get.rs b/lib/entry/libimagentrytimetrack/src/iter/get.rs
index 62e0a85d..62e0a85d 100644
--- a/libimagentrytimetrack/src/iter/get.rs
+++ b/lib/entry/libimagentrytimetrack/src/iter/get.rs
diff --git a/libimagentrytimetrack/src/iter/mod.rs b/lib/entry/libimagentrytimetrack/src/iter/mod.rs
index 467199d8..467199d8 100644
--- a/libimagentrytimetrack/src/iter/mod.rs
+++ b/lib/entry/libimagentrytimetrack/src/iter/mod.rs
diff --git a/libimagentrytimetrack/src/iter/setendtime.rs b/lib/entry/libimagentrytimetrack/src/iter/setendtime.rs
index 89eb382b..89eb382b 100644
--- a/libimagentrytimetrack/src/iter/setendtime.rs
+++ b/lib/entry/libimagentrytimetrack/src/iter/setendtime.rs
diff --git a/libimagentrytimetrack/src/iter/storeid.rs b/lib/entry/libimagentrytimetrack/src/iter/storeid.rs
index a3071908..a3071908 100644
--- a/libimagentrytimetrack/src/iter/storeid.rs
+++ b/lib/entry/libimagentrytimetrack/src/iter/storeid.rs
diff --git a/libimagentrytimetrack/src/iter/tag.rs b/lib/entry/libimagentrytimetrack/src/iter/tag.rs
index da006d8b..da006d8b 100644
--- a/libimagentrytimetrack/src/iter/tag.rs
+++ b/lib/entry/libimagentrytimetrack/src/iter/tag.rs
diff --git a/libimagentrytimetrack/src/lib.rs b/lib/entry/libimagentrytimetrack/src/lib.rs
index e3f9d2aa..e3f9d2aa 100644
--- a/libimagentrytimetrack/src/lib.rs
+++ b/lib/entry/libimagentrytimetrack/src/lib.rs
diff --git a/libimagentrytimetrack/src/result.rs b/lib/entry/libimagentrytimetrack/src/result.rs
index 8ea8173f..8ea8173f 100644
--- a/libimagentrytimetrack/src/result.rs
+++ b/lib/entry/libimagentrytimetrack/src/result.rs
diff --git a/libimagentrytimetrack/src/tag.rs b/lib/entry/libimagentrytimetrack/src/tag.rs
index df2f9795..df2f9795 100644
--- a/libimagentrytimetrack/src/tag.rs
+++ b/lib/entry/libimagentrytimetrack/src/tag.rs
diff --git a/libimagentrytimetrack/src/timetracking.rs b/lib/entry/libimagentrytimetrack/src/timetracking.rs
index ba40ac65..ba40ac65 100644
--- a/libimagentrytimetrack/src/timetracking.rs
+++ b/lib/entry/libimagentrytimetrack/src/timetracking.rs
diff --git a/libimagentrytimetrack/src/timetrackingstore.rs b/lib/entry/libimagentrytimetrack/src/timetrackingstore.rs
index 94e993ac..94e993ac 100644
--- a/libimagentrytimetrack/src/timetrackingstore.rs
+++ b/lib/entry/libimagentrytimetrack/src/timetrackingstore.rs
diff --git a/libimagentryview/Cargo.toml b/lib/entry/libimagentryview/Cargo.toml
index 410d1cd7..201215b6 100644
--- a/libimagentryview/Cargo.toml
+++ b/lib/entry/libimagentryview/Cargo.toml
@@ -18,7 +18,7 @@ log = "0.3"
toml = "^0.4"
glob = "0.2"
-libimagrt = { version = "0.4.0", path = "../libimagrt" }
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimagentryedit = { version = "0.4.0", path = "../libimagentryedit" }
+libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagentryedit = { version = "0.4.0", path = "../../../lib/entry/libimagentryedit" }
diff --git a/libimagentryview/src/builtin/editor.rs b/lib/entry/libimagentryview/src/builtin/editor.rs
index 259d4986..259d4986 100644
--- a/libimagentryview/src/builtin/editor.rs
+++ b/lib/entry/libimagentryview/src/builtin/editor.rs
diff --git a/libimagentryview/src/builtin/mod.rs b/lib/entry/libimagentryview/src/builtin/mod.rs
index 26d5b223..26d5b223 100644
--- a/libimagentryview/src/builtin/mod.rs
+++ b/lib/entry/libimagentryview/src/builtin/mod.rs
diff --git a/libimagentryview/src/builtin/plain.rs b/lib/entry/libimagentryview/src/builtin/plain.rs
index f40b2527..f40b2527 100644
--- a/libimagentryview/src/builtin/plain.rs
+++ b/lib/entry/libimagentryview/src/builtin/plain.rs
diff --git a/libimagentryview/src/builtin/stdout.rs b/lib/entry/libimagentryview/src/builtin/stdout.rs
index 3d9fea05..3d9fea05 100644
--- a/libimagentryview/src/builtin/stdout.rs
+++ b/lib/entry/libimagentryview/src/builtin/stdout.rs
diff --git a/libimagentryview/src/error.rs b/lib/entry/libimagentryview/src/error.rs
index c471b3f3..c471b3f3 100644
--- a/libimagentryview/src/error.rs
+++ b/lib/entry/libimagentryview/src/error.rs
diff --git a/libimagentryview/src/lib.rs b/lib/entry/libimagentryview/src/lib.rs
index 55d58d6a..55d58d6a 100644
--- a/libimagentryview/src/lib.rs
+++ b/lib/entry/libimagentryview/src/lib.rs
diff --git a/libimagentryview/src/result.rs b/lib/entry/libimagentryview/src/result.rs
index 3650b1fe..3650b1fe 100644
--- a/libimagentryview/src/result.rs
+++ b/lib/entry/libimagentryview/src/result.rs
diff --git a/libimagentryview/src/viewer.rs b/lib/entry/libimagentryview/src/viewer.rs
index 35763126..35763126 100644
--- a/libimagentryview/src/viewer.rs
+++ b/lib/entry/libimagentryview/src/viewer.rs
diff --git a/libimaginteraction/Cargo.toml b/lib/etc/libimaginteraction/Cargo.toml
index 150f8eb1..6ed38c94 100644
--- a/libimaginteraction/Cargo.toml
+++ b/lib/etc/libimaginteraction/Cargo.toml
@@ -24,7 +24,7 @@ toml = "^0.4"
spinner = "0.4"
rustyline = "1.0"
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagentryfilter = { version = "0.4.0", path = "../libimagentryfilter" }
-libimagutil = { version = "0.4.0", path = "../libimagutil" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
+libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
+libimagentryfilter = { version = "0.4.0", path = "../../../lib/entry/libimagentryfilter" }
diff --git a/libimaginteraction/README.md b/lib/etc/libimaginteraction/README.md
index e7d18f69..e7d18f69 120000
--- a/libimaginteraction/README.md
+++ b/lib/etc/libimaginteraction/README.md
diff --git a/libimaginteraction/src/ask.rs b/lib/etc/libimaginteraction/src/ask.rs
index 2a393d0e..2a393d0e 100644
--- a/libimaginteraction/src/ask.rs
+++ b/lib/etc/libimaginteraction/src/ask.rs
diff --git a/libimaginteraction/src/error.rs b/lib/etc/libimaginteraction/src/error.rs
index 1a4be7df..1a4be7df 100644
--- a/libimaginteraction/src/error.rs
+++ b/lib/etc/libimaginteraction/src/error.rs
diff --git a/libimaginteraction/src/filter.rs b/lib/etc/libimaginteraction/src/filter.rs
index 5869a529..5869a529 100644
--- a/libimaginteraction/src/filter.rs
+++ b/lib/etc/libimaginteraction/src/filter.rs
diff --git a/libimaginteraction/src/lib.rs b/lib/etc/libimaginteraction/src/lib.rs
index 67c61cf4..67c61cf4 100644
--- a/libimaginteraction/src/lib.rs
+++ b/lib/etc/libimaginteraction/src/lib.rs
diff --git a/libimaginteraction/src/readline.rs b/lib/etc/libimaginteraction/src/readline.rs
index 7b998dd0..7b998dd0 100644
--- a/libimaginteraction/src/readline.rs
+++ b/lib/etc/libimaginteraction/src/readline.rs
diff --git a/libimaginteraction/src/result.rs b/lib/etc/libimaginteraction/src/result.rs
index 8eeaf47b..8eeaf47b 100644
--- a/libimaginteraction/src/result.rs
+++ b/lib/etc/libimaginteraction/src/result.rs
diff --git a/libimaginteraction/src/ui.rs b/lib/etc/libimaginteraction/src/ui.rs
index 49c4619d..49c4619d 100644
--- a/libimaginteraction/src/ui.rs
+++ b/lib/etc/libimaginteraction/src/ui.rs
diff --git a/libimagtimeui/Cargo.toml b/lib/etc/libimagtimeui/Cargo.toml
index ab66090b..ab66090b 100644
--- a/libimagtimeui/Cargo.toml
+++ b/lib/etc/libimagtimeui/Cargo.toml
diff --git a/libimagtimeui/src/cli.rs b/lib/etc/libimagtimeui/src/cli.rs
index 7db6c33d..7db6c33d 100644
--- a/libimagtimeui/src/cli.rs
+++ b/lib/etc/libimagtimeui/src/cli.rs
diff --git a/libimagtimeui/src/date.rs b/lib/etc/libimagtimeui/src/date.rs
index 6e87035b..6e87035b 100644
--- a/libimagtimeui/src/date.rs
+++ b/lib/etc/libimagtimeui/src/date.rs
diff --git a/libimagtimeui/src/datetime.rs b/lib/etc/libimagtimeui/src/datetime.rs
index 03929106..03929106 100644
--- a/libimagtimeui/src/datetime.rs
+++ b/lib/etc/libimagtimeui/src/datetime.rs
diff --git a/libimagtimeui/src/lib.rs b/lib/etc/libimagtimeui/src/lib.rs
index b06bba78..b06bba78 100644
--- a/libimagtimeui/src/lib.rs
+++ b/lib/etc/libimagtimeui/src/lib.rs
diff --git a/libimagtimeui/src/parse.rs b/lib/etc/libimagtimeui/src/parse.rs
index b578551b..b578551b 100644
--- a/libimagtimeui/src/parse.rs
+++ b/lib/etc/libimagtimeui/src/parse.rs
diff --git a/libimagtimeui/src/time.rs b/lib/etc/libimagtimeui/src/time.rs
index 8c37b07c..8c37b07c 100644
--- a/libimagtimeui/src/time.rs
+++ b/lib/etc/libimagtimeui/src/time.rs
diff --git a/libimagtimeui/src/ui.rs b/lib/etc/libimagtimeui/src/ui.rs
index 642d5203..642d5203 100644
--- a/libimagtimeui/src/ui.rs
+++ b/lib/etc/libimagtimeui/src/ui.rs
diff --git a/libimagutil/.gitignore b/lib/etc/libimagutil/.gitignore
index eb5a316c..eb5a316c 100644
--- a/libimagutil/.gitignore
+++ b/lib/etc/libimagutil/.gitignore
diff --git a/libimagutil/Cargo.toml b/lib/etc/libimagutil/Cargo.toml
index b0e06f45..b0e06f45 100644
--- a/libimagutil/Cargo.toml
+++ b/lib/etc/libimagutil/Cargo.toml
diff --git a/libimagutil/README.md b/lib/etc/libimagutil/README.md
index 3b9cd3f1..3b9cd3f1 120000
--- a/libimagutil/README.md
+++ b/lib/etc/libimagutil/README.md
diff --git a/libimagutil/src/cli_validators.rs b/lib/etc/libimagutil/src/cli_validators.rs
index 24340a4d..24340a4d 100644
--- a/libimagutil/src/cli_validators.rs
+++ b/lib/etc/libimagutil/src/cli_validators.rs
diff --git a/libimagutil/src/debug_result.rs b/lib/etc/libimagutil/src/debug_result.rs
index e7506633..e7506633 100644
--- a/libimagutil/src/debug_result.rs
+++ b/lib/etc/libimagutil/src/debug_result.rs
diff --git a/libimagutil/src/edit.rs b/lib/etc/libimagutil/src/edit.rs
index 5d1838fc..5d1838fc 100644
--- a/libimagutil/src/edit.rs
+++ b/lib/etc/libimagutil/src/edit.rs
diff --git a/libimagutil/src/info_result.rs b/lib/etc/libimagutil/src/info_result.rs
index 9c106bc8..9c106bc8 100644
--- a/libimagutil/src/info_result.rs
+++ b/lib/etc/libimagutil/src/info_result.rs
diff --git a/libimagutil/src/iter.rs b/lib/etc/libimagutil/src/iter.rs
index 98f8e676..98f8e676 100644
--- a/libimagutil/src/iter.rs
+++ b/lib/etc/libimagutil/src/iter.rs
diff --git a/libimagutil/src/key_value_split.rs b/lib/etc/libimagutil/src/key_value_split.rs
index 2d405f3a..2d405f3a 100644
--- a/libimagutil/src/key_value_split.rs
+++ b/lib/etc/libimagutil/src/key_value_split.rs
diff --git a/libimagutil/src/lib.rs b/lib/etc/libimagutil/src/lib.rs
index b5d30f51..b5d30f51 100644
--- a/libimagutil/src/lib.rs
+++ b/lib/etc/libimagutil/src/lib.rs
diff --git a/libimagutil/src/log_result.rs b/lib/etc/libimagutil/src/log_result.rs
index 45977b2a..45977b2a 100644
--- a/libimagutil/src/log_result.rs
+++ b/lib/etc/libimagutil/src/log_result.rs
diff --git a/libimagutil/src/testing.rs b/lib/etc/libimagutil/src/testing.rs
index 13a70d99..13a70d99 100644
--- a/libimagutil/src/testing.rs
+++ b/lib/etc/libimagutil/src/testing.rs
diff --git a/libimagutil/src/variants.rs b/lib/etc/libimagutil/src/variants.rs
index 2f0746d2..2f0746d2 100644
--- a/libimagutil/src/variants.rs
+++ b/lib/etc/libimagutil/src/variants.rs
diff --git a/libimagutil/src/warn_exit.rs b/lib/etc/libimagutil/src/warn_exit.rs
index fbda4d25..fbda4d25 100644
--- a/libimagutil/src/warn_exit.rs
+++ b/lib/etc/libimagutil/src/warn_exit.rs
diff --git a/libimagutil/src/warn_result.rs b/lib/etc/libimagutil/src/warn_result.rs
index 6b05b285..6b05b285 100644
--- a/libimagutil/src/warn_result.rs
+++ b/lib/etc/libimagutil/src/warn_result.rs
diff --git a/libimagannotation/Cargo.toml b/libimagannotation/Cargo.toml
deleted file mode 100644
index f4e3a659..00000000
--- a/libimagannotation/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "libimagannotation"
-version = "0.4.0"
-authors = ["Matthias Beyer <mail@beyermatthias.de>"]
-
-description = "Library for the imag core distribution"
-
-keywords = ["imag", "PIM", "personal", "information", "management"]
-readme = "../README.md"
-license = "LGPL-2.1"
-
-[dependencies]
-uuid = { version = "0.3.1", features = ["v4"] }
-lazy_static = "0.1.15"
-toml = "^0.4"
-
-libimagstore = { version = "0.4.0", path = "../libimagstore" }
-libimagnotes = { version = "0.4.0", path = "../libimagnotes" }
-libimagerror = { version = "0.4.0", path = "../libimagerror" }
-libimagentrylink = { version = "0.4.0", path = "../libimagentrylink" }
-libimagutil = { version = "0.4.0", path = "../libimagutil" }