Tweak layout of services to conveniently handle large service families

services/index.js

@@ -2,14 +2,9 @@
 
 const glob = require('glob');
 
-// Match modules with the same name as their containing directory.
-// e.g. services/appveyor/appveyor.js
-const serviceRegex = /\/services\/(.*)\/\1\.js$/;
-
 function loadServiceClasses() {
   // New-style services
-  const services = glob.sync(`${__dirname}/**/*.js`)
-    .filter(path => serviceRegex.test(path))
+  const services = glob.sync(`${__dirname}/**/*.service.js`)
     .map(path => require(path));
 
   const serviceClasses = [];