0
@@ -6,7 +6,7 @@
0
  */
0
 
0
 define('CHIPPINO_LOCATION', dirname(__FILE__) . DIRECTORY_SEPARATOR);
0
-define('CHIPPINO_LIBRARY_LOCATION', CHIPPINO_LOCATION . 'library' . DIRECTORY_SEPARATOR . 'chippino' . DIRECTORY_SEPARATOR);
0
+define('CHIPPINO_LIBRARY_LOCATION', CHIPPINO_LOCATION . 'library' . DIRECTORY_SEPARATOR);
0
 
0
 /**
0
  * Chippino initiator. used to create the chain
0
@@ -41,15 +41,15 @@ function chip($file = NULL) {
0
   $normalize = array(
0
     CHIPPINO_LIBRARY_LOCATION,
0
     strtolower(CHIPPINO_LIBRARY_LOCATION),
0
-		chippino_config()->base_path . 'chippino' . DIRECTORY_SEPARATOR,
0
-		strtolower(chippino_config()->base_path . 'chippino' . DIRECTORY_SEPARATOR),
0
+		chippino_config()->base_path,
0
+		strtolower(chippino_config()->base_path),
0
   );
0
   
0
   $caller = dirname(str_replace($normalize, '', $chip->getFilePath()));
0
   $callee = dirname(str_replace($normalize, '', $chip->getOrigin()));
0
 
0
   if ($caller != $callee) {
0
-		throw new Chippino_Access_Exception($callee, $caller);
0
+		throw new Chippino_Access_Exception($chip->getFilePath(), $chip->getOrigin());
0
   }
0
   
0
   return $chip;