diff --git a/plc4go/internal/bacnetip/bacgopes/basetypes/basetypes_NameValue.go b/plc4go/internal/bacnetip/bacgopes/basetypes/basetypes_NameValue.go
index ce71ddbeda9..60c2c95a34c 100644
--- a/plc4go/internal/bacnetip/bacgopes/basetypes/basetypes_NameValue.go
+++ b/plc4go/internal/bacnetip/bacgopes/basetypes/basetypes_NameValue.go
@@ -24,11 +24,10 @@ import (
 
 	"github.com/pkg/errors"
 
-	readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model"
-
 	. "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp"
 	. "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/constructeddata"
 	. "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/primitivedata"
+	readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model"
 )
 
 type NameValue struct {
diff --git a/plc4go/pom.xml b/plc4go/pom.xml
index 80c7fdd46a2..b2a1324b5be 100644
--- a/plc4go/pom.xml
+++ b/plc4go/pom.xml
@@ -427,79 +427,10 @@
             </goals>
             <configuration>
               <exec>goimports-reviser</exec>
-              <customCommand>-recursive</customCommand>
+              <customCommand>-excludes</customCommand>
               <packages>
-                <package>internal</package>
-              </packages>
-            </configuration>
-          </execution>
-          <execution>
-            <id>fix-imports-pkg</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>custom</goal>
-            </goals>
-            <configuration>
-              <exec>goimports-reviser</exec>
-              <customCommand>-recursive</customCommand>
-              <packages>
-                <package>pkg</package>
-              </packages>
-            </configuration>
-          </execution>
-          <execution>
-            <id>fix-imports-protocols</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>custom</goal>
-            </goals>
-            <configuration>
-              <exec>goimports-reviser</exec>
-              <customCommand>-recursive</customCommand>
-              <packages>
-                <package>protocols</package>
-              </packages>
-            </configuration>
-          </execution>
-          <execution>
-            <id>fix-imports-spi</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>custom</goal>
-            </goals>
-            <configuration>
-              <exec>goimports-reviser</exec>
-              <customCommand>-recursive</customCommand>
-              <packages>
-                <package>spi</package>
-              </packages>
-            </configuration>
-          </execution>
-          <execution>
-            <id>fix-imports-tests</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>custom</goal>
-            </goals>
-            <configuration>
-              <exec>goimports-reviser</exec>
-              <customCommand>-recursive</customCommand>
-              <packages>
-                <package>tests</package>
-              </packages>
-            </configuration>
-          </execution>
-          <execution>
-            <id>fix-imports-tools</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>custom</goal>
-            </goals>
-            <configuration>
-              <exec>goimports-reviser</exec>
-              <customCommand>-recursive</customCommand>
-              <packages>
-                <package>tools</package>
+                <package>.idea,.git</package>
+                <package>./...</package>
               </packages>
             </configuration>
           </execution>