diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index f736e98..7b12b09 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/cmd/crudgen" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/cmd/crudgen/crudgen b/cmd/crudgen/crudgen
new file mode 100755
index 0000000..5171fd0
Binary files /dev/null and b/cmd/crudgen/crudgen differ
diff --git a/internal/writer.go b/internal/writer.go
index 2ccf94b..f12bdf6 100644
--- a/internal/writer.go
+++ b/internal/writer.go
@@ -17,14 +17,16 @@ import (
 
 func ImplementServiceStruct(entityName string, file *ast.File, reimplement bool) {
 	serviceName := entityName + "Service"
-	isServiceStructDeclarated := false
+	isServiceStructDefined := false
 	var insertPos int
+	var decls []ast.Decl
 
 	for i, decl := range file.Decls {
 		genDecl, ok := decl.(*ast.GenDecl)
 		if !ok {
 			continue
 		}
+		decls = append(decls, decl)
 		if genDecl.Tok == token.IMPORT {
 			insertPos = i + 1
 			continue
@@ -40,14 +42,16 @@ func ImplementServiceStruct(entityName string, file *ast.File, reimplement bool)
 			}
 			if _, ok := typeSpec.Type.(*ast.StructType); ok {
 				if typeSpec.Name != nil && typeSpec.Name.Name == serviceName {
-					isServiceStructDeclarated = true
+					isServiceStructDefined = true
+					if reimplement {
+						decls = decls[:1]
+					}
 				}
 			}
-
 		}
 	}
 
-	if isServiceStructDeclarated && !reimplement {
+	if isServiceStructDefined && !reimplement {
 		return
 	}
 
@@ -63,7 +67,7 @@ func ImplementServiceStruct(entityName string, file *ast.File, reimplement bool)
 		},
 	}
 
-	file.Decls = append(file.Decls[:insertPos], append([]ast.Decl{serviceStruct}, file.Decls[insertPos:]...)...)
+	file.Decls = append(decls[:insertPos], append([]ast.Decl{serviceStruct}, decls[insertPos:]...)...)
 }
 
 func importExists(fset *token.FileSet, file *ast.File, importPath string) bool {
@@ -147,5 +151,7 @@ func ImplementService(mainPkgPath string, modelName string, reimplement bool) er
 		return err
 	}
 
+	defer file.Close()
+
 	return nil
 }