refactor

22 files changed, 10 insertions, 10 deletions

diff --git a/cmd/rr/.rr.yaml b/cmd/rr/.rr.yaml
index fd54d03e..752573f6 100644
--- a/cmd/rr/.rr.yaml
+++ b/cmd/rr/.rr.yaml
@@ -39,7 +39,7 @@ http:
       maxJobs:  0
 
       # for how long worker is allowed to be bootstrapped.
-      allocateTimeout: 600000000
+      allocateTimeout: 60000000
 
       # amount of time given to worker to gracefully destruct itself.
       destroyTimeout:  600000000
diff --git a/cmd/rr/debug/listener.go b/cmd/rr/debug/listener.go
index 5c9fb559..5239538b 100644
--- a/cmd/rr/debug/listener.go
+++ b/cmd/rr/debug/listener.go
@@ -2,7 +2,7 @@ package debug
 
 import (
 	"github.com/sirupsen/logrus"
-	"github.com/spiral/roadrunner/http"
+	"github.com/spiral/roadrunner/service/http"
 	"github.com/spiral/roadrunner/cmd/rr/utils"
 	"github.com/spiral/roadrunner"
 )
diff --git a/cmd/rr/http/reset.go b/cmd/rr/http/reset.go
index 2583f8cd..907022c3 100644
--- a/cmd/rr/http/reset.go
+++ b/cmd/rr/http/reset.go
@@ -24,7 +24,7 @@ import (
 	"errors"
 	"github.com/spf13/cobra"
 	rr "github.com/spiral/roadrunner/cmd/rr/cmd"
-	"github.com/spiral/roadrunner/rpc"
+	"github.com/spiral/roadrunner/service/rpc"
 	"github.com/spiral/roadrunner/service"
 	"github.com/spiral/roadrunner/cmd/rr/utils"
 )
diff --git a/cmd/rr/http/workers.go b/cmd/rr/http/workers.go
index 43b78d11..394874fa 100644
--- a/cmd/rr/http/workers.go
+++ b/cmd/rr/http/workers.go
@@ -28,8 +28,8 @@ import (
 	"github.com/shirou/gopsutil/process"
 	"github.com/spf13/cobra"
 	rr "github.com/spiral/roadrunner/cmd/rr/cmd"
-	"github.com/spiral/roadrunner/http"
-	rrpc "github.com/spiral/roadrunner/rpc"
+	"github.com/spiral/roadrunner/service/http"
+	rrpc "github.com/spiral/roadrunner/service/rpc"
 	"github.com/spiral/roadrunner/service"
 	"github.com/spiral/roadrunner/cmd/rr/utils"
 	"net/rpc"
diff --git a/cmd/rr/main.go b/cmd/rr/main.go
index 945b8fa0..db696904 100644
--- a/cmd/rr/main.go
+++ b/cmd/rr/main.go
@@ -26,9 +26,9 @@ import (
 	rr "github.com/spiral/roadrunner/cmd/rr/cmd"
 
 	// services (plugins)
-	"github.com/spiral/roadrunner/http"
-	"github.com/spiral/roadrunner/rpc"
-	"github.com/spiral/roadrunner/static"
+	"github.com/spiral/roadrunner/service/http"
+	"github.com/spiral/roadrunner/service/rpc"
+	"github.com/spiral/roadrunner/service/static"
 
 	// cli plugins
 	_ "github.com/spiral/roadrunner/cmd/rr/http"
diff --git a/http/config.go b/service/http/config.go
index d92b4c60..d92b4c60 100644
--- a/http/config.go
+++ b/service/http/config.go
diff --git a/http/parse.go b/service/http/parse.go
index 01030831..01030831 100644
--- a/http/parse.go
+++ b/service/http/parse.go
diff --git a/http/request.go b/service/http/request.go
index c7304c8d..c7304c8d 100644
--- a/http/request.go
+++ b/service/http/request.go
diff --git a/http/response.go b/service/http/response.go
index dd092353..dd092353 100644
--- a/http/response.go
+++ b/service/http/response.go
diff --git a/http/rpc.go b/service/http/rpc.go
index 2adb8706..2adb8706 100644
--- a/http/rpc.go
+++ b/service/http/rpc.go
diff --git a/http/server.go b/service/http/server.go
index de414b08..de414b08 100644
--- a/http/server.go
+++ b/service/http/server.go
diff --git a/http/service.go b/service/http/service.go
index 79141d07..ba941c7c 100644
--- a/http/service.go
+++ b/service/http/service.go
@@ -5,7 +5,7 @@ import (
 	"github.com/spiral/roadrunner/service"
 	"context"
 	"github.com/spiral/roadrunner"
-	"github.com/spiral/roadrunner/rpc"
+	"github.com/spiral/roadrunner/service/rpc"
 )
 
 // Name contains default svc name.
diff --git a/http/uploads.go b/service/http/uploads.go
index 1f3060c0..1f3060c0 100644
--- a/http/uploads.go
+++ b/service/http/uploads.go
diff --git a/http/uploads_config.go b/service/http/uploads_config.go
index 715de69a..715de69a 100644
--- a/http/uploads_config.go
+++ b/service/http/uploads_config.go
diff --git a/http/uploads_config_test.go b/service/http/uploads_config_test.go
index 7704a486..7704a486 100644
--- a/http/uploads_config_test.go
+++ b/service/http/uploads_config_test.go
diff --git a/rpc/config.go b/service/rpc/config.go
index 06d63d65..06d63d65 100644
--- a/rpc/config.go
+++ b/service/rpc/config.go
diff --git a/rpc/config_test.go b/service/rpc/config_test.go
index a953e30e..a953e30e 100644
--- a/rpc/config_test.go
+++ b/service/rpc/config_test.go
diff --git a/rpc/service.go b/service/rpc/service.go
index ce1e3351..ce1e3351 100644
--- a/rpc/service.go
+++ b/service/rpc/service.go
diff --git a/rpc/service_test.go b/service/rpc/service_test.go
index a57ce1bd..a57ce1bd 100644
--- a/rpc/service_test.go
+++ b/service/rpc/service_test.go
diff --git a/static/config.go b/service/static/config.go
index 2a1f6c13..2a1f6c13 100644
--- a/static/config.go
+++ b/service/static/config.go
diff --git a/static/config_test.go b/service/static/config_test.go
index ce31348a..ce31348a 100644
--- a/static/config_test.go
+++ b/service/static/config_test.go
diff --git a/static/service.go b/service/static/service.go
index 5f6030aa..5c3defe6 100644
--- a/static/service.go
+++ b/service/static/service.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"path"
 	"strings"
-	rrttp "github.com/spiral/roadrunner/http"
+	rrttp "github.com/spiral/roadrunner/service/http"
 	"github.com/spiral/roadrunner/service"
 )