diff --git a/.gitignore b/.gitignore
index 370da9c3256..40b435db240 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@ out/
 *.iws
 classpath.txt
 version.properties
-!modules/swagger-codegen-cli/src/main/resources/version.properties
+!modules/swagger-codegen/src/main/resources/version.properties
 .project
 .classpath
 lib/*
diff --git a/modules/swagger-codegen-cli/pom.xml b/modules/swagger-codegen-cli/pom.xml
index e175b2c4585..2843f3ffc40 100644
--- a/modules/swagger-codegen-cli/pom.xml
+++ b/modules/swagger-codegen-cli/pom.xml
@@ -18,7 +18,6 @@
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
-                <filtering>true</filtering>
                 <excludes>
                     <exclude>logback.xml</exclude>
                 </excludes>
@@ -79,17 +78,6 @@
             <artifactId>swagger-codegen</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!--https://github.com/airlift/airline-->
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>airline</artifactId>
-            <version>0.7</version>
-        </dependency>
-        <dependency>
-            <groupId>com.googlecode.lambdaj</groupId>
-            <artifactId>lambdaj</artifactId>
-            <version>2.3.3</version>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
diff --git a/modules/swagger-codegen-cli/src/main/resources/version.properties b/modules/swagger-codegen-cli/src/main/resources/version.properties
deleted file mode 100644
index 410af8cc687..00000000000
--- a/modules/swagger-codegen-cli/src/main/resources/version.properties
+++ /dev/null
@@ -1 +0,0 @@
-version = ${project.version}
diff --git a/modules/swagger-codegen/pom.xml b/modules/swagger-codegen/pom.xml
index 05206eb2f9b..7d4320cf086 100644
--- a/modules/swagger-codegen/pom.xml
+++ b/modules/swagger-codegen/pom.xml
@@ -16,6 +16,7 @@
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
+                <filtering>true</filtering>
                 <excludes>
                     <exclude>logback.xml</exclude>
                 </excludes>
@@ -249,6 +250,16 @@
             <artifactId>commons-cli</artifactId>
             <version>${commons-cli-version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>airline</artifactId>
+            <version>0.7</version>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.lambdaj</groupId>
+            <artifactId>lambdaj</artifactId>
+            <version>2.3.3</version>
+        </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
index 665b6dfd5dd..209960cbcff 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
@@ -2,6 +2,7 @@ package io.swagger.codegen;
 
 import com.samskivert.mustache.Mustache;
 import com.samskivert.mustache.Template;
+import io.swagger.codegen.cmd.Version;
 import io.swagger.codegen.ignore.CodegenIgnoreProcessor;
 import io.swagger.models.*;
 import io.swagger.models.auth.OAuth2Definition;
@@ -10,6 +11,7 @@ import io.swagger.models.parameters.Parameter;
 import io.swagger.util.Json;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,8 +19,6 @@ import org.slf4j.LoggerFactory;
 import java.io.*;
 import java.util.*;
 
-import org.apache.commons.lang3.StringUtils;
-
 public class DefaultGenerator extends AbstractGenerator implements Generator {
     protected final Logger LOGGER = LoggerFactory.getLogger(DefaultGenerator.class);
     protected CodegenConfig config;
@@ -127,8 +127,8 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
         config.processOpts();
         config.preprocessSwagger(swagger);
         // TODO need to obtain version from a file instead of hardcoding it
-        config.additionalProperties().put("generatorVersion", "2.2.3-SNAPSHOT");
         config.additionalProperties().put("generatedDate", DateTime.now().toString());
+        config.additionalProperties().put("generatorVersion", Version.readVersionFromResources());
         config.additionalProperties().put("generatorClass", config.getClass().getName());
         config.additionalProperties().put("inputSpec", config.getInputSpec());
         if (swagger.getVendorExtensions() != null) {
diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java
similarity index 100%
rename from modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java
rename to modules/swagger-codegen/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java
diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/cmd/Generate.java
similarity index 100%
rename from modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java
rename to modules/swagger-codegen/src/main/java/io/swagger/codegen/cmd/Generate.java
diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Langs.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/cmd/Langs.java
similarity index 100%
rename from modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Langs.java
rename to modules/swagger-codegen/src/main/java/io/swagger/codegen/cmd/Langs.java
diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/cmd/Meta.java
similarity index 100%
rename from modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java
rename to modules/swagger-codegen/src/main/java/io/swagger/codegen/cmd/Meta.java
diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Version.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/cmd/Version.java
similarity index 100%
rename from modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Version.java
rename to modules/swagger-codegen/src/main/java/io/swagger/codegen/cmd/Version.java
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/api.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/api.mustache
index 0e23cd4f59b..961ccbb5806 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpring/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpring/api.mustache
@@ -1,3 +1,9 @@
+/**
+ * NOTE: This class is auto generated by the swagger code generator program ({{{generatorVersion}}}).
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
 package {{package}};
 
 {{#imports}}import {{import}};
diff --git a/modules/swagger-codegen/src/main/resources/version.properties b/modules/swagger-codegen/src/main/resources/version.properties
new file mode 100644
index 00000000000..713c915800a
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/version.properties
@@ -0,0 +1 @@
+version = ${project.version}
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java
index d8b307a1f23..b785ec808b1 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java
@@ -1,3 +1,9 @@
+/**
+ * NOTE: This class is auto generated by the swagger code generator program (2.2.3-SNAPSHOT).
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
 package io.swagger.api;
 
 import java.math.BigDecimal;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java
index 5816fb5b92e..a21a1d70a45 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java
@@ -1,3 +1,9 @@
+/**
+ * NOTE: This class is auto generated by the swagger code generator program (2.2.3-SNAPSHOT).
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
 package io.swagger.api;
 
 import io.swagger.model.ModelApiResponse;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java
index fb8f3d706f5..7077532a3e5 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java
@@ -1,3 +1,9 @@
+/**
+ * NOTE: This class is auto generated by the swagger code generator program (2.2.3-SNAPSHOT).
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
 package io.swagger.api;
 
 import java.util.Map;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java
index 53899d1eddd..a4535afce65 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java
@@ -1,3 +1,9 @@
+/**
+ * NOTE: This class is auto generated by the swagger code generator program (2.2.3-SNAPSHOT).
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
 package io.swagger.api;
 
 import java.util.List;