diff --git a/doc/doc/Config.pp.sample b/doc/Config.pp.sample
similarity index 100%
rename from doc/doc/Config.pp.sample
rename to doc/Config.pp.sample
diff --git a/doc/doc/Config.prc b/doc/Config.prc
similarity index 100%
rename from doc/doc/Config.prc
rename to doc/Config.prc
diff --git a/doc/doc/INSTALL-MK b/doc/INSTALL-MK
similarity index 99%
rename from doc/doc/INSTALL-MK
rename to doc/INSTALL-MK
index 11edf6c77d..01d586aaa6 100644
--- a/doc/doc/INSTALL-MK
+++ b/doc/INSTALL-MK
@@ -39,10 +39,9 @@ directory will contain the following subdirectories:
     makepanda	- piece 1, source code from sourceforge
     models	- piece 1, source code from sourceforge
     panda	- piece 1, source code from sourceforge
-    pandaapp	- piece 1, source code from sourceforge
     pandatool	- piece 1, source code from sourceforge
     ppremake	- piece 1, source code from sourceforge
-    SceneEditor - piece 1, source code from sourceforge
+    contrib     - piece 1, source code from sourceforge
     thirdparty  - piece 2, third party tools
     samples	- piece 3, sample programs
 
diff --git a/doc/doc/INSTALL-PP b/doc/INSTALL-PP
similarity index 100%
rename from doc/doc/INSTALL-PP
rename to doc/INSTALL-PP
diff --git a/doc/doc/INSTALLING-PLUGINS.TXT b/doc/INSTALLING-PLUGINS.TXT
similarity index 100%
rename from doc/doc/INSTALLING-PLUGINS.TXT
rename to doc/INSTALLING-PLUGINS.TXT
diff --git a/doc/doc/InstallerNotes b/doc/InstallerNotes
similarity index 100%
rename from doc/doc/InstallerNotes
rename to doc/InstallerNotes
diff --git a/doc/doc/README b/doc/README
similarity index 98%
rename from doc/doc/README
rename to doc/README
index 7b23f1a5d1..24d2413d54 100644
--- a/doc/doc/README
+++ b/doc/README
@@ -29,4 +29,4 @@ to use either build system.  Please refer to the documents INSTALL-PP
 or INSTALL-MK, in this directory, for build instructions for ppremake
 and makepanda, respectively.  You may also be interested in
 downloading the prebuilt Panda3D binaries from the Panda website at
-http://panda3d.etc.cmu.edu/ .
+http://www.panda3d.org/ .
diff --git a/doc/doc/ReleaseNotes b/doc/ReleaseNotes
similarity index 100%
rename from doc/doc/ReleaseNotes
rename to doc/ReleaseNotes
diff --git a/doc/doc/LICENSE b/doc/doc/LICENSE
deleted file mode 100644
index d23c583266..0000000000
--- a/doc/doc/LICENSE
+++ /dev/null
@@ -1,30 +0,0 @@
-Copyright (c) 2008, Carnegie Mellon University.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. Neither the name of Carnegie Mellon University nor the names of
-   other contributors may be used to endorse or promote products
-   derived from this software without specific prior written
-   permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHORS "AS IS" AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-(This is the Modified BSD License.  See also
-http://www.opensource.org/licenses/bsd-license.php )