diff --git a/compiler/frontend/src/jet/ExtensionFunctions.jet b/compiler/frontend/src/jet/ExtensionFunctions.jet
index 72bd94f9017..6bda816d59b 100644
--- a/compiler/frontend/src/jet/ExtensionFunctions.jet
+++ b/compiler/frontend/src/jet/ExtensionFunctions.jet
@@ -1,4 +1,4 @@
-// Generated by TuplesAndFunctionsGenerator
+// Generated by org.jetbrains.jet.generators.GenerateTuplesAndFunctions
 
 package jet
 
diff --git a/compiler/frontend/src/jet/Functions.jet b/compiler/frontend/src/jet/Functions.jet
index 52d592e3434..503ad178477 100644
--- a/compiler/frontend/src/jet/Functions.jet
+++ b/compiler/frontend/src/jet/Functions.jet
@@ -1,4 +1,4 @@
-// Generated by TuplesAndFunctionsGenerator
+// Generated by org.jetbrains.jet.generators.GenerateTuplesAndFunctions
 
 package jet
 
diff --git a/compiler/frontend/src/jet/Tuples.jet b/compiler/frontend/src/jet/Tuples.jet
index d3fae10ec79..638ce7f15cd 100644
--- a/compiler/frontend/src/jet/Tuples.jet
+++ b/compiler/frontend/src/jet/Tuples.jet
@@ -1,4 +1,4 @@
-// Generated by TuplesAndFunctionsGenerator
+// Generated by org.jetbrains.jet.generators.GenerateTuplesAndFunctions
 
 package jet
 
diff --git a/compiler/frontend/generator/TuplesAndFunctionsGenerator.java b/generators/org/jetbrains/jet/generators/GenerateTuplesAndFunctions.java
similarity index 92%
rename from compiler/frontend/generator/TuplesAndFunctionsGenerator.java
rename to generators/org/jetbrains/jet/generators/GenerateTuplesAndFunctions.java
index 50bff855cc6..258416820db 100644
--- a/compiler/frontend/generator/TuplesAndFunctionsGenerator.java
+++ b/generators/org/jetbrains/jet/generators/GenerateTuplesAndFunctions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2010-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+package org.jetbrains.jet.generators;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.PrintStream;
@@ -21,7 +23,7 @@ import java.io.PrintStream;
 /**
  * @author abreslav
  */
-public class TuplesAndFunctionsGenerator {
+public class GenerateTuplesAndFunctions {
     private static final int TUPLE_COUNT = 23;
 
     private static void generateTuples(PrintStream out, int count) {
@@ -78,7 +80,7 @@ public class TuplesAndFunctionsGenerator {
     }
 
     private static void generated(PrintStream out) {
-        out.println("// Generated by " + TuplesAndFunctionsGenerator.class.getCanonicalName());
+        out.println("// Generated by " + GenerateTuplesAndFunctions.class.getName());
         out.println();
         out.println("package jet");
         out.println();
@@ -100,4 +102,7 @@ public class TuplesAndFunctionsGenerator {
         generateFunctions(extensionFunctions, TUPLE_COUNT, true);
         extensionFunctions.close();
     }
+
+    private GenerateTuplesAndFunctions() {
+    }
 }