diff --git a/common.inc.php b/common.inc.php
index eaf3f2574e2265e642031a995e7da4ae0dc037f5..a50f94ce25e43661e2ffe21ed1e074fb79ff39e0 100644
--- a/common.inc.php
+++ b/common.inc.php
@@ -35,6 +35,8 @@ $conf['http_accept']['nt']   = array('text/plain');
 $conf['service']['prefix'] = 'service.';
 $conf['service']['class'] = 'classes/BasicSpecialFunction.php';
 
+$conf['class']['prefix'] = 'class.';
+
 //Frontpage when user goes to http://example.org/
 $conf['root'] = 'index.html';
 $conf['extension_connector'] = '.';
diff --git a/modules/classModule.php b/modules/classModule.php
index 3348c78d90616618568d28293bec39a5cf70b406..66ae43d9f7415738af93833fb2461caad8195ee7 100644
--- a/modules/classModule.php
+++ b/modules/classModule.php
@@ -62,7 +62,6 @@ class ClassModule extends abstractModule{
   	$t=Queries::getClass($uri, $endpoints['local']);
   	
   	list($modelFile, $viewFile) = $this::getModelandView($t, $extension);
-  	
   	$base = $conf['view']['standard'];
   	$base['type'] = $modelFile;
   	$base['this']['value'] = $uri;
@@ -112,11 +111,11 @@ class ClassModule extends abstractModule{
   	}
   	arsort($typesAndValues);
   	foreach($typesAndValues as $v => $w){
-  	  $auxViewFile  = $conf['view']['directory'].$v.$conf['view']['extension'].".".$extension;
-  	  $auxModelFile = $conf['model']['directory'].$v.$conf['model']['extension'].".".$extension;
+  	  $auxViewFile  = $conf['view']['directory'].$conf['class']['prefix'].$v.'/'.$extension.'.template';
+  	  $auxModelFile = $conf['model']['directory'].$conf['class']['prefix'].$v.'/'.$extension.'.queries';
   	  if(file_exists($auxModelFile) && file_exists($auxViewFile) && $v != null){
-  	  	$viewFile = $v.$conf['view']['extension'].".".$extension;
-  	  	$modelFile = $v.$conf['model']['extension'].".".$extension;
+  	  	$viewFile = $conf['class']['prefix'].$v.'/'.$extension.'.template';
+  	  	$modelFile = $conf['class']['prefix'].$v.'/'.$extension.'.queries';
   	  	break;
   	  }
   	}