diff --git a/sitegin/index.js b/sitegin/index.js
index 81d4fe1931bbd00d67e12e385184535dcbaa2dab..11f1d0e125fb514de4048cf45a499a7df8979f86 100755
--- a/sitegin/index.js
+++ b/sitegin/index.js
@@ -128,10 +128,13 @@ function copyStaticFiles(builddir) {
     },
   )
   fsextra.copy(
-    path.join(__dirname, '..', 'static', 'articles'),
+    path.join(__dirname, '..', 'content', 'articles'),
     `${builddir}/clanek`,
+    (file) => {
+      return !file.endsWith('.md')
+    },
     () => {
-      console.log('copy static/articles done')
+      console.log('copy content/articles done')
     },
   )
 }
diff --git a/sitegin/readFiles.js b/sitegin/readFiles.js
index 3976c29d598dd40d8715acb75ee8d8a481105782..aca4823793d3a7f9e3591000f0542e2dcff05671 100644
--- a/sitegin/readFiles.js
+++ b/sitegin/readFiles.js
@@ -10,6 +10,7 @@ export default (obj) => {
   const onFile = (root, fileStats, next, array) => {
     // ignore files like .gitkeep
     if (fileStats.name.startsWith('.')) return next()
+    if (!fileStats.name.endsWith('.md')) return next()
     const filename = path.join(root, fileStats.name)
     const file = path.relative(path.join(__dirname, '..', 'content'), filename)
     fs.readFile(filename, 'utf8', (err, data) => {
diff --git a/sitegin/urls.js b/sitegin/urls.js
index 23fa9c052005c59467cfa49aec1ed09c5c99d6f3..03e16ca4cad319ba1381d0a31a78a238b53c1568 100644
--- a/sitegin/urls.js
+++ b/sitegin/urls.js
@@ -1,14 +1,22 @@
 /*
  * This jobs translates files to resulting URL
  */
+import path from 'path'
 
 export const rewriteURL = (file) =>
-  file.replace(/\.md$/, '/').replace(/^articles/, 'clanek')
+  file.replace(/\/[^/]+$/, '/').replace(/^articles/, 'clanek')
 
 export default (obj) => {
   console.log('Build step: URLs')
   return new Promise((resolve) => {
     for (const page of obj.pages) {
+      const basename = path.basename(page.file, '.md')
+      if (!page.file.endsWith(basename + '/' + basename + '.md')) {
+        throw new Error(
+          'Article md file must be in eponymous folder (ie. something/article-name/article-name.md)',
+        )
+      }
+      page.originalFile = page.file
       page.file = rewriteURL(page.file)
       page.canonicalURL = `https://ok1kvk.cz/${page.file}`
     }
diff --git a/theme-source/templates/article.tsx b/theme-source/templates/article.tsx
index 8d0ef77ebb117f8b0229f5aaf1cb98690d0e2273..16794bdc70b19e63b4433fce8612635257ffde47 100644
--- a/theme-source/templates/article.tsx
+++ b/theme-source/templates/article.tsx
@@ -84,7 +84,7 @@ export default {
   },
 }
 
-function Article({ metadata, content, config, file }) {
+function Article({ metadata, content, config, originalFile }) {
   return (
     <BaseBody config={config}>
       <div className="section container" id="content">
@@ -98,9 +98,7 @@ function Article({ metadata, content, config, file }) {
               className="author"
               style={{ color: '#a2a2a2', display: 'block' }}
               target="_blank"
-              href={`https://git.ok1kvk.cz/ok1kvk.cz/content/tree/main/content/articles/${file
-                .replace('clanek/', '')
-                .replace(/\/$/, '')}.md`}
+              href={`https://git.ok1kvk.cz/ok1kvk.cz/content/tree/main/content/articles/${originalFile}`}
             >
               {metadata.published ? (
                 <>