diff --git a/src/IDF/Conf.php b/src/IDF/Conf.php
index 57fbca2..d322617 100644
--- a/src/IDF/Conf.php
+++ b/src/IDF/Conf.php
@@ -73,7 +73,7 @@ class IDF_Conf extends Pluf_Model
                                        'type' => 'unique',
                                        ),
                                  );
-        $this->f = new IDF_Conf_DataProxy($this);
+        $this->f = new IDF_Config_DataProxy($this);
     }
 
     function setProject($project)
diff --git a/src/IDF/Conf/DataProxy.php b/src/IDF/Conf/DataProxy.php
deleted file mode 100644
index 226b17b..0000000
--- a/src/IDF/Conf/DataProxy.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
-# ***** BEGIN LICENSE BLOCK *****
-# This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
-#
-# InDefero is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# InDefero is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#
-# ***** END LICENSE BLOCK ***** */
-
-/**
- * Field proxy to access the configuration data through
- * {$conf.f.fieldname} in a template.
- */
-
-class IDF_Conf_DataProxy
-{
-    protected $obj = null;
-
-    public function __construct(&$obj)
-    {
-        $this->obj = $obj;
-    }
-
-    public function __get($field)
-    {
-        return $this->obj->getVal($field);
-    }
-}
diff --git a/src/IDF/Config/DataProxy.php b/src/IDF/Config/DataProxy.php
new file mode 100644
index 0000000..fb88b70
--- /dev/null
+++ b/src/IDF/Config/DataProxy.php
@@ -0,0 +1,42 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of InDefero, an open source project management application.
+# Copyright (C) 2008 Céondo Ltd and contributors.
+#
+# InDefero is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# InDefero is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Field proxy to access the configuration data through
+ * {$conf.f.fieldname} in a template.
+ */
+
+class IDF_Config_DataProxy
+{
+    protected $obj = null;
+
+    public function __construct(&$obj)
+    {
+        $this->obj = $obj;
+    }
+
+    public function __get($field)
+    {
+        return $this->obj->getVal($field);
+    }
+}