diff --git a/cbox-tree.d/_offline/doc_footer.inc b/cbox-tree.d/_offline/doc/doc_footer.inc
similarity index 100%
rename from cbox-tree.d/_offline/doc_footer.inc
rename to cbox-tree.d/_offline/doc/doc_footer.inc
diff --git a/cbox-tree.d/_offline/doc_header.inc b/cbox-tree.d/_offline/doc/doc_header.inc
similarity index 100%
rename from cbox-tree.d/_offline/doc_header.inc
rename to cbox-tree.d/_offline/doc/doc_header.inc
diff --git a/scripts/userdocexport.sh b/scripts/userdocexport.sh
index 44dbf32..641cb68 100755
--- a/scripts/userdocexport.sh
+++ b/scripts/userdocexport.sh
@@ -87,8 +87,7 @@ for LANG in $LANGUAGES; do
 		echo "	building static doc page"
 		offline_file=$OFFLINE_DIR/$LANG/$(basename $TMP_FILE)
 		mkdir -p "$OFFLINE_DIR/$LANG"
-		# TODO move first header file to $OFFLINE_DIR instead of $OFFLINE_DIR/..
-		cat "$OFFLINE_DIR/../$HEADER_FILE" "$OFFLINE_DIR/$LANG/$HEADER_FILE" "$TMP_FILE" "$OFFLINE_DIR/$LANG/$FOOTER_FILE" "$OFFLINE_DIR/../$FOOTER_FILE" >"$offline_file"
+		cat "$OFFLINE_DIR/$HEADER_FILE" "$OFFLINE_DIR/$LANG/$HEADER_FILE" "$TMP_FILE" "$OFFLINE_DIR/$LANG/$FOOTER_FILE" "$OFFLINE_DIR/$FOOTER_FILE" >"$offline_file"
 		sed -i "s#=\"$CBOX_CGI\([^\"]*\)\"#=\"\1.html\"#g" "$offline_file"
 		# do it twice - this should not be necessary
 		sed -i "s#=\"$CBOX_CGI\([^\"]*\)\"#=\"\1.html\"#g" "$offline_file"