diff --git a/app/JavaCallApp.go b/adapter/call/JavaCallApp.go
similarity index 95%
rename from app/JavaCallApp.go
rename to adapter/call/JavaCallApp.go
index d593f9dccf7e71f335c23712c09141317fcfca3c..823b3f3bb228fc56c2627317c22293f204ca853b 100644
--- a/app/JavaCallApp.go
+++ b/adapter/call/JavaCallApp.go
@@ -1,4 +1,4 @@
-package app
+package call
 
 import (
 	"fmt"
@@ -7,8 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	. "../adapter"
-	. "../language/java"
+	. "../../language/java"
 )
 
 type JavaCallApp struct {
diff --git a/adapter/JavaCallListener.go b/adapter/call/JavaCallListener.go
similarity index 98%
rename from adapter/JavaCallListener.go
rename to adapter/call/JavaCallListener.go
index 76b854259f46472b518ea889f907a37a017412d8..d12b0e5949f3601b2999f806a6b48896fabe3d83 100644
--- a/adapter/JavaCallListener.go
+++ b/adapter/call/JavaCallListener.go
@@ -1,7 +1,7 @@
-package adapter
+package call
 
 import (
-	. "../language/java"
+	. "../../language/java"
 	. "./models"
 	"github.com/antlr/antlr4/runtime/Go/antlr"
 	"reflect"
diff --git a/adapter/models/JMethodCall.go b/adapter/call/models/JMethodCall.go
similarity index 100%
rename from adapter/models/JMethodCall.go
rename to adapter/call/models/JMethodCall.go
diff --git a/adapter/visitor/JavaCallVisitor.go b/adapter/call/visitor/JavaCallVisitor.go
similarity index 96%
rename from adapter/visitor/JavaCallVisitor.go
rename to adapter/call/visitor/JavaCallVisitor.go
index e00d330ade96d8dbe309268fadb58bb322adcbcb..9b6ef012cfd314a07df1ea8141666eb79f687256 100644
--- a/adapter/visitor/JavaCallVisitor.go
+++ b/adapter/call/visitor/JavaCallVisitor.go
@@ -1,7 +1,7 @@
 package visitor;
 
 import (
-	. "../../language/java"
+	. "../../../language/java"
 	"fmt"
 )
 
diff --git a/helloworld.go b/helloworld.go
index 844dfdb01b5c359bece5164c42e36d4ffaae53e4..af19356aeb805940057fef0241409b012556a18e 100644
--- a/helloworld.go
+++ b/helloworld.go
@@ -1,10 +1,9 @@
 package main
 
 import (
-	//"./cmd"
 	"os"
 
-	. "./app"
+	. "./adapter/call"
 )
 
 func main() {