diff --git a/Makefile b/Makefile
index 9623fbb..3b988ed 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 include config.mk
 
 PROJECT  = zathura
-SOURCE   = zathura.c
+SOURCE   = callbacks.c commands.c config.c shortcuts.c utils.c zathura.c
 OBJECTS  = ${SOURCE:.c=.o}
 DOBJECTS = ${SOURCE:.c=.do}
 
diff --git a/callbacks.c b/callbacks.c
index e69de29..6c3efe1 100644
--- a/callbacks.c
+++ b/callbacks.c
@@ -0,0 +1 @@
+/* See LICENSE file for license and copyright information */
diff --git a/callbacks.h b/callbacks.h
index e69de29..6c3efe1 100644
--- a/callbacks.h
+++ b/callbacks.h
@@ -0,0 +1 @@
+/* See LICENSE file for license and copyright information */
diff --git a/commands.c b/commands.c
index e69de29..4774076 100644
--- a/commands.c
+++ b/commands.c
@@ -0,0 +1,45 @@
+/* See LICENSE file for license and copyright information */
+
+#include "commands.h"
+
+bool
+cmd_bookmark_create(girara_session_t* session, int argc, char** argv)
+{
+  return true;
+}
+
+bool
+cmd_bookmark_delete(girara_session_t* session, int argc, char** argv)
+{
+  return true;
+}
+
+bool
+cmd_bookmark_open(girara_session_t* session, int argc, char** argv)
+{
+  return true;
+}
+
+bool
+cmd_close(girara_session_t* session, int argc, char** argv)
+{
+  return true;
+}
+
+bool
+cmd_info(girara_session_t* session, int argc, char** argv)
+{
+  return true;
+}
+
+bool
+cmd_print(girara_session_t* session, int argc, char** argv)
+{
+  return true;
+}
+
+bool
+cmd_save(girara_session_t* session, int argc, char** argv)
+{
+  return true;
+}
diff --git a/commands.h b/commands.h
index e69de29..31d6b06 100644
--- a/commands.h
+++ b/commands.h
@@ -0,0 +1,12 @@
+/* See LICENSE file for license and copyright information */
+
+#include <stdbool.h>
+#include <girara.h>
+
+bool cmd_bookmark_create(girara_session_t* session, int argc, char** argv);
+bool cmd_bookmark_delete(girara_session_t* session, int argc, char** argv);
+bool cmd_bookmark_open(girara_session_t* session, int argc, char** argv);
+bool cmd_close(girara_session_t* session, int argc, char** argv);
+bool cmd_info(girara_session_t* session, int argc, char** argv);
+bool cmd_print(girara_session_t* session, int argc, char** argv);
+bool cmd_save(girara_session_t* session, int argc, char** argv);
diff --git a/completion.c b/completion.c
new file mode 100644
index 0000000..6c3efe1
--- /dev/null
+++ b/completion.c
@@ -0,0 +1 @@
+/* See LICENSE file for license and copyright information */
diff --git a/completion.h b/completion.h
new file mode 100644
index 0000000..6c3efe1
--- /dev/null
+++ b/completion.h
@@ -0,0 +1 @@
+/* See LICENSE file for license and copyright information */
diff --git a/config.c b/config.c
index e69de29..6c3efe1 100644
--- a/config.c
+++ b/config.c
@@ -0,0 +1 @@
+/* See LICENSE file for license and copyright information */
diff --git a/config.h b/config.h
new file mode 100644
index 0000000..6c3efe1
--- /dev/null
+++ b/config.h
@@ -0,0 +1 @@
+/* See LICENSE file for license and copyright information */
diff --git a/shortcuts.h b/shortcuts.h
index e69de29..6c3efe1 100644
--- a/shortcuts.h
+++ b/shortcuts.h
@@ -0,0 +1 @@
+/* See LICENSE file for license and copyright information */
diff --git a/utils.h b/utils.h
index e69de29..6c3efe1 100644
--- a/utils.h
+++ b/utils.h
@@ -0,0 +1 @@
+/* See LICENSE file for license and copyright information */