diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro
index c6f2e052..e71c057d 100644
--- a/YACReader/YACReader.pro
+++ b/YACReader/YACReader.pro
@@ -61,6 +61,9 @@ HEADERS += comic.h \
 	../common/yacreader_flow_gl.h \
 	../common/yacreader_global.h \
 	../common/onstart_flow_selection_dialog.h \
+	../common/comic_db.h \
+	../common/folder.h \
+	../common/library_item.h \
 	yacreader_local_client.h
 	
 SOURCES += comic.cpp \
@@ -90,6 +93,9 @@ SOURCES += comic.cpp \
 	../common/qnaturalsorting.cpp \
 	../common/yacreader_flow_gl.cpp \
 	../common/onstart_flow_selection_dialog.cpp \
+	../common/comic_db.cpp \
+	../common/folder.cpp \
+	../common/library_item.cpp \
 	yacreader_local_client.cpp
 
 include(../custom_widgets/custom_widgets.pri)
diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro
index 0c4daeff..cff5ad7c 100644
--- a/YACReaderLibrary/YACReaderLibrary.pro
+++ b/YACReaderLibrary/YACReaderLibrary.pro
@@ -61,9 +61,9 @@ HEADERS += comic_flow.h \
 		   ./db/treemodel.h \
 		   ./db/tablemodel.h \
 		   ./db/tableitem.h \
-		   ./db/comic_db.h \
-		   ./db/folder.h \
-		   ./db/library_item.h \
+		   ../common/comic_db.h \
+		   ../common/folder.h \
+		   ../common/library_item.h \
 		   ../YACReader/comic.h \
 		   ../YACReader/bookmarks.h \
 		   ../common/pictureflow.h \
@@ -101,9 +101,9 @@ SOURCES += comic_flow.cpp \
 		   ./db/treemodel.cpp \
 		   ./db/tablemodel.cpp \
 		   ./db/tableitem.cpp \
-		   ./db/comic_db.cpp \
-		   ./db/folder.cpp \
-		   ./db/library_item.cpp \
+		   ../common/comic_db.cpp \
+		   ../common/folder.cpp \
+		   ../common/library_item.cpp \
 		   ../YACReader/comic.cpp \
 		   ../YACReader/bookmarks.cpp \
            ../common/pictureflow.cpp \
diff --git a/YACReaderLibrary/db/comic_db.cpp b/common/comic_db.cpp
similarity index 100%
rename from YACReaderLibrary/db/comic_db.cpp
rename to common/comic_db.cpp
diff --git a/YACReaderLibrary/db/comic_db.h b/common/comic_db.h
similarity index 100%
rename from YACReaderLibrary/db/comic_db.h
rename to common/comic_db.h
diff --git a/YACReaderLibrary/db/folder.cpp b/common/folder.cpp
similarity index 100%
rename from YACReaderLibrary/db/folder.cpp
rename to common/folder.cpp
diff --git a/YACReaderLibrary/db/folder.h b/common/folder.h
similarity index 100%
rename from YACReaderLibrary/db/folder.h
rename to common/folder.h
diff --git a/YACReaderLibrary/db/library_item.cpp b/common/library_item.cpp
similarity index 100%
rename from YACReaderLibrary/db/library_item.cpp
rename to common/library_item.cpp
diff --git a/YACReaderLibrary/db/library_item.h b/common/library_item.h
similarity index 100%
rename from YACReaderLibrary/db/library_item.h
rename to common/library_item.h