diff --git a/bin/get_metadata.js b/bin/get-metadata
similarity index 86%
rename from bin/get_metadata.js
rename to bin/get-metadata
index 8d3f378f..c3d683d1 100755
--- a/bin/get_metadata.js
+++ b/bin/get-metadata
@@ -2,7 +2,7 @@
 'use strict';
 
 const argv = require('../lib/args')();
-const getMetadata = require('../steps/metadata');
+const getMetadata = require('../components/metadata');
 const CLI = require('../lib/cli');
 
 const logStream = process.stdout.isTTY ? process.stdout : process.stderr;
diff --git a/steps/metadata.js b/components/metadata.js
similarity index 100%
rename from steps/metadata.js
rename to components/metadata.js
diff --git a/lib/pr_data.js b/lib/pr_data.js
index 8822506f..0af3de8b 100644
--- a/lib/pr_data.js
+++ b/lib/pr_data.js
@@ -3,7 +3,7 @@
 const { getCollaborators } = require('./collaborators');
 const { ReviewAnalyzer } = require('./reviews');
 
-// queries/*.gql file names
+// lib/queries/*.gql file names
 const PR_QUERY = 'PR';
 const REVIEWS_QUERY = 'Reviews';
 const COMMENTS_QUERY = 'PRComments';
diff --git a/queries/PR.gql b/lib/queries/PR.gql
similarity index 100%
rename from queries/PR.gql
rename to lib/queries/PR.gql
diff --git a/queries/PRComments.gql b/lib/queries/PRComments.gql
similarity index 100%
rename from queries/PRComments.gql
rename to lib/queries/PRComments.gql
diff --git a/queries/PRCommits.gql b/lib/queries/PRCommits.gql
similarity index 100%
rename from queries/PRCommits.gql
rename to lib/queries/PRCommits.gql
diff --git a/queries/Reviews.gql b/lib/queries/Reviews.gql
similarity index 100%
rename from queries/Reviews.gql
rename to lib/queries/Reviews.gql
diff --git a/queries/User.gql b/lib/queries/User.gql
similarity index 100%
rename from queries/User.gql
rename to lib/queries/User.gql
diff --git a/lib/request.js b/lib/request.js
index d8c13614..56f8a7cd 100644
--- a/lib/request.js
+++ b/lib/request.js
@@ -10,7 +10,7 @@ class Request {
   }
 
   loadQuery(file) {
-    const filePath = path.resolve(__dirname, '..', 'queries', `${file}.gql`);
+    const filePath = path.resolve(__dirname, 'queries', `${file}.gql`);
     return fs.readFileSync(filePath, 'utf8');
   }
 
diff --git a/package.json b/package.json
index 6a846d36..edc2eec2 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "Utilities for Node.js core collaborators",
   "main": "./bin/metadata.js",
   "bin": {
-    "get-metadata": "./bin/get_metadata.js"
+    "get-metadata": "./bin/get-metadata"
   },
   "scripts": {
     "test": "npm run test-unit && npm run lint",
@@ -24,8 +24,7 @@
   "files": [
     "lib/",
     "bin/",
-    "queries/",
-    "steps/"
+    "components/"
   ],
   "license": "MIT",
   "dependencies": {