diff --git a/lib/plugins/aws/package/index.js b/lib/plugins/aws/package/index.js
index 2e879bcc6..5058cbe49 100644
--- a/lib/plugins/aws/package/index.js
+++ b/lib/plugins/aws/package/index.js
@@ -8,8 +8,6 @@ const generateCoreTemplate = require('./lib/generateCoreTemplate');
 const saveServiceState = require('./lib/saveServiceState');
 const saveCompiledTemplate = require('./lib/saveCompiledTemplate');
 const mergeIamTemplates = require('./lib/mergeIamTemplates');
-const zipService = require('./lib/zipService');
-const packageService = require('./lib/packageService');
 
 class AwsPackage {
   constructor(serverless, options) {
@@ -23,8 +21,6 @@ class AwsPackage {
 
     Object.assign(
       this,
-      packageService,
-      zipService,
       generateCoreTemplate,
       mergeIamTemplates,
       generateArtifactDirectoryName,
@@ -71,9 +67,6 @@ class AwsPackage {
       'package:setupProviderConfiguration': () => BbPromise.bind(this)
         .then(this.mergeIamTemplates),
 
-      'package:createDeploymentArtifacts': () => BbPromise.bind(this)
-        .then(this.packageService),
-
       'before:package:compileFunctions': () => BbPromise.bind(this)
         .then(this.generateArtifactDirectoryName),
 
diff --git a/lib/plugins/aws/package/lib/packageService.js b/lib/plugins/package/lib/packageService.js
similarity index 100%
rename from lib/plugins/aws/package/lib/packageService.js
rename to lib/plugins/package/lib/packageService.js
diff --git a/lib/plugins/aws/package/lib/packageService.test.js b/lib/plugins/package/lib/packageService.test.js
similarity index 100%
rename from lib/plugins/aws/package/lib/packageService.test.js
rename to lib/plugins/package/lib/packageService.test.js
diff --git a/lib/plugins/aws/package/lib/zipService.js b/lib/plugins/package/lib/zipService.js
similarity index 100%
rename from lib/plugins/aws/package/lib/zipService.js
rename to lib/plugins/package/lib/zipService.js
diff --git a/lib/plugins/aws/package/lib/zipService.test.js b/lib/plugins/package/lib/zipService.test.js
similarity index 100%
rename from lib/plugins/aws/package/lib/zipService.test.js
rename to lib/plugins/package/lib/zipService.test.js
diff --git a/lib/plugins/package/package.js b/lib/plugins/package/package.js
index c49154523..67bf1d336 100644
--- a/lib/plugins/package/package.js
+++ b/lib/plugins/package/package.js
@@ -1,9 +1,24 @@
 'use strict';
 
+const BbPromise = require('bluebird');
+const path = require('path');
+const zipService = require('./lib/zipService');
+const packageService = require('./lib/packageService');
+
 class Package {
   constructor(serverless, options) {
     this.serverless = serverless;
     this.options = options;
+    this.servicePath = this.serverless.config.servicePath || '';
+    this.packagePath = this.options.package ||
+      this.serverless.service.package.path ||
+      path.join(this.servicePath || '.', '.serverless');
+
+    Object.assign(
+      this,
+      packageService,
+      zipService
+    );
 
     this.commands = {
       package: {
@@ -33,6 +48,11 @@ class Package {
         },
       },
     };
+
+    this.hooks = {
+      'package:createDeploymentArtifacts': () => BbPromise.bind(this)
+        .then(this.packageService),
+    };
   }
 }