diff --git a/lib/corereqs.js b/lib/corereqs.js
index 50046ee..6d1b061 100644
--- a/lib/corereqs.js
+++ b/lib/corereqs.js
@@ -113,7 +113,7 @@ the way requests are described here
 
 */
 
-module.exports = {
+var templates = {
    CreateWindow: [
        // create request packet - function OR format string
        function(id, parentId, x, y, width, height, borderWidth, depth, _class, visual, values) {
@@ -912,8 +912,6 @@ module.exports = {
            return [ 'CxSL', [113, 2, resource] ];
        }
    ],
-   
-   KillKlient: KillClient,
 
    SetScreenSaver: [
        function(timeout, interval, preferBlanking, allowExposures) {
@@ -926,6 +924,8 @@ module.exports = {
            return [ 'CCS', [115, activate?1:0, 1] ];
        }
    ]
+};
 
+templates.KillKlient = templates.KillClient;
 
-}
+module.exports = templates;