diff --git a/Makefile b/Makefile
index 0312dd91f..9ca5d9bf0 100644
--- a/Makefile
+++ b/Makefile
@@ -39,11 +39,7 @@ sources_API := \
  src/General/CrossOrigin.coffee \
  src/Images/ImageCommon.coffee
 
-sources_classes := \
- src/classes/Post.coffee src/classes/Clone.coffee \
- $(filter-out \
-  %/Post.coffee %/Clone.coffee \
-  ,$(call sort_dir,classes))
+sources_classes := $(call sort_dir,classes)
 
 sources_General := \
  $(filter-out \
diff --git a/src/classes/Clone.coffee b/src/classes/Post.Clone.coffee
similarity index 96%
rename from src/classes/Clone.coffee
rename to src/classes/Post.Clone.coffee
index c3e1d9bac..45333eb1b 100644
--- a/src/classes/Clone.coffee
+++ b/src/classes/Post.Clone.coffee
@@ -1,4 +1,4 @@
-class Clone extends Post
+Post.Clone = class extends Post
   isClone: true
 
   constructor: (@origin, @context, contractThumb) ->
@@ -11,10 +11,10 @@ class Clone extends Post
       @cloneWithoutVideo nodes.root
     else
       nodes.root.cloneNode true
-    Clone.prefix or= 0
+    Post.Clone.prefix or= 0
     for node in [root, $$('[id]', root)...]
-      node.id = Clone.prefix + node.id
-    Clone.prefix++
+      node.id = Post.Clone.prefix + node.id
+    Post.Clone.prefix++
     post = $ '.post',     root
     info = $ '.postInfo', post
     @nodes =
diff --git a/src/classes/Post.coffee b/src/classes/Post.coffee
index 3438a0885..9598f8c76 100644
--- a/src/classes/Post.coffee
+++ b/src/classes/Post.coffee
@@ -261,7 +261,7 @@ class Post
     @board.posts.rm @
 
   addClone: (context, contractThumb) ->
-    new Clone @, context, contractThumb
+    new Post.Clone @, context, contractThumb
 
   rmClone: (index) ->
     @clones.splice index, 1