diff --git a/cake/libs/controller/scaffold.php b/lib/Cake/Controller/Scaffold.php
similarity index 100%
rename from cake/libs/controller/scaffold.php
rename to lib/Cake/Controller/Scaffold.php
diff --git a/cake/libs/cake_socket.php b/lib/Cake/Network/CakeSocket.php
similarity index 100%
rename from cake/libs/cake_socket.php
rename to lib/Cake/Network/CakeSocket.php
diff --git a/cake/libs/http_socket.php b/lib/Cake/Network/HttpSocket.php
similarity index 100%
rename from cake/libs/http_socket.php
rename to lib/Cake/Network/HttpSocket.php
diff --git a/cake/libs/file.php b/lib/Cake/Utility/File.php
similarity index 100%
rename from cake/libs/file.php
rename to lib/Cake/Utility/File.php
diff --git a/cake/libs/magic_db.php b/lib/Cake/Utility/MagicDb.php
similarity index 100%
rename from cake/libs/magic_db.php
rename to lib/Cake/Utility/MagicDb.php
diff --git a/cake/libs/sanitize.php b/lib/Cake/Utility/Sanitize.php
similarity index 100%
rename from cake/libs/sanitize.php
rename to lib/Cake/Utility/Sanitize.php
diff --git a/cake/libs/security.php b/lib/Cake/Utility/Security.php
similarity index 100%
rename from cake/libs/security.php
rename to lib/Cake/Utility/Security.php
diff --git a/cake/libs/validation.php b/lib/Cake/Utility/Validation.php
similarity index 100%
rename from cake/libs/validation.php
rename to lib/Cake/Utility/Validation.php
diff --git a/cake/libs/xml.php b/lib/Cake/Utility/Xml.php
similarity index 100%
rename from cake/libs/xml.php
rename to lib/Cake/Utility/Xml.php