diff --git a/LUFA.pnproj b/LUFA.pnproj
index 7d7af8147d..3559c41344 100644
--- a/LUFA.pnproj
+++ b/LUFA.pnproj
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/LUFA/Doxygen.conf b/LUFA/Doxygen.conf
index 5a02c5cb6b..947f49ac3a 100644
--- a/LUFA/Doxygen.conf
+++ b/LUFA/Doxygen.conf
@@ -44,7 +44,7 @@ PROJECT_BRIEF =
# exceed 55 pixels and the maximum width should not exceed 200 pixels.
# Doxygen will copy the logo to the output directory.
-PROJECT_LOGO = ./ManPages/LUFA_thumb.png
+PROJECT_LOGO = ./DoxygenPages/LUFA_thumb.png
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
@@ -855,7 +855,7 @@ HTML_HEADER =
# each generated HTML page. If it is left blank doxygen will generate a
# standard footer.
-HTML_FOOTER = ./ManPages/footer.htm
+HTML_FOOTER = ./DoxygenPages/footer.htm
# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
# style sheet that is used by each HTML page. It can be used to
diff --git a/LUFA/ManPages/AboutLUFA.txt b/LUFA/DoxygenPages/AboutLUFA.txt
similarity index 100%
rename from LUFA/ManPages/AboutLUFA.txt
rename to LUFA/DoxygenPages/AboutLUFA.txt
diff --git a/LUFA/ManPages/AlternativeStacks.txt b/LUFA/DoxygenPages/AlternativeStacks.txt
similarity index 100%
rename from LUFA/ManPages/AlternativeStacks.txt
rename to LUFA/DoxygenPages/AlternativeStacks.txt
diff --git a/LUFA/ManPages/Author.jpg b/LUFA/DoxygenPages/Author.jpg
similarity index 100%
rename from LUFA/ManPages/Author.jpg
rename to LUFA/DoxygenPages/Author.jpg
diff --git a/LUFA/ManPages/BuildingLinkableLibraries.txt b/LUFA/DoxygenPages/BuildingLinkableLibraries.txt
similarity index 100%
rename from LUFA/ManPages/BuildingLinkableLibraries.txt
rename to LUFA/DoxygenPages/BuildingLinkableLibraries.txt
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt
similarity index 100%
rename from LUFA/ManPages/ChangeLog.txt
rename to LUFA/DoxygenPages/ChangeLog.txt
diff --git a/LUFA/ManPages/CompileTimeTokens.txt b/LUFA/DoxygenPages/CompileTimeTokens.txt
similarity index 100%
rename from LUFA/ManPages/CompileTimeTokens.txt
rename to LUFA/DoxygenPages/CompileTimeTokens.txt
diff --git a/LUFA/ManPages/CompilingApps.txt b/LUFA/DoxygenPages/CompilingApps.txt
similarity index 100%
rename from LUFA/ManPages/CompilingApps.txt
rename to LUFA/DoxygenPages/CompilingApps.txt
diff --git a/LUFA/ManPages/ConfiguringApps.txt b/LUFA/DoxygenPages/ConfiguringApps.txt
similarity index 100%
rename from LUFA/ManPages/ConfiguringApps.txt
rename to LUFA/DoxygenPages/ConfiguringApps.txt
diff --git a/LUFA/ManPages/DevelopingWithLUFA.txt b/LUFA/DoxygenPages/DevelopingWithLUFA.txt
similarity index 100%
rename from LUFA/ManPages/DevelopingWithLUFA.txt
rename to LUFA/DoxygenPages/DevelopingWithLUFA.txt
diff --git a/LUFA/ManPages/DeviceSupport.txt b/LUFA/DoxygenPages/DeviceSupport.txt
similarity index 100%
rename from LUFA/ManPages/DeviceSupport.txt
rename to LUFA/DoxygenPages/DeviceSupport.txt
diff --git a/LUFA/ManPages/DirectorySummaries.txt b/LUFA/DoxygenPages/DirectorySummaries.txt
similarity index 100%
rename from LUFA/ManPages/DirectorySummaries.txt
rename to LUFA/DoxygenPages/DirectorySummaries.txt
diff --git a/LUFA/ManPages/Donating.txt b/LUFA/DoxygenPages/Donating.txt
similarity index 100%
rename from LUFA/ManPages/Donating.txt
rename to LUFA/DoxygenPages/Donating.txt
diff --git a/LUFA/ManPages/FutureChanges.txt b/LUFA/DoxygenPages/FutureChanges.txt
similarity index 100%
rename from LUFA/ManPages/FutureChanges.txt
rename to LUFA/DoxygenPages/FutureChanges.txt
diff --git a/LUFA/ManPages/GettingStarted.txt b/LUFA/DoxygenPages/GettingStarted.txt
similarity index 100%
rename from LUFA/ManPages/GettingStarted.txt
rename to LUFA/DoxygenPages/GettingStarted.txt
diff --git a/LUFA/ManPages/Groups.txt b/LUFA/DoxygenPages/Groups.txt
similarity index 100%
rename from LUFA/ManPages/Groups.txt
rename to LUFA/DoxygenPages/Groups.txt
diff --git a/LUFA/ManPages/LUFA.png b/LUFA/DoxygenPages/LUFA.png
similarity index 100%
rename from LUFA/ManPages/LUFA.png
rename to LUFA/DoxygenPages/LUFA.png
diff --git a/LUFA/ManPages/LUFAPoweredProjects.txt b/LUFA/DoxygenPages/LUFAPoweredProjects.txt
similarity index 100%
rename from LUFA/ManPages/LUFAPoweredProjects.txt
rename to LUFA/DoxygenPages/LUFAPoweredProjects.txt
diff --git a/LUFA/ManPages/LUFA_thumb.png b/LUFA/DoxygenPages/LUFA_thumb.png
similarity index 100%
rename from LUFA/ManPages/LUFA_thumb.png
rename to LUFA/DoxygenPages/LUFA_thumb.png
diff --git a/LUFA/ManPages/LUFAvsAtmelStack.txt b/LUFA/DoxygenPages/LUFAvsAtmelStack.txt
similarity index 100%
rename from LUFA/ManPages/LUFAvsAtmelStack.txt
rename to LUFA/DoxygenPages/LUFAvsAtmelStack.txt
diff --git a/LUFA/ManPages/LibraryApps.txt b/LUFA/DoxygenPages/LibraryApps.txt
similarity index 100%
rename from LUFA/ManPages/LibraryApps.txt
rename to LUFA/DoxygenPages/LibraryApps.txt
diff --git a/LUFA/ManPages/LibraryResources.txt b/LUFA/DoxygenPages/LibraryResources.txt
similarity index 100%
rename from LUFA/ManPages/LibraryResources.txt
rename to LUFA/DoxygenPages/LibraryResources.txt
diff --git a/LUFA/ManPages/LicenseInfo.txt b/LUFA/DoxygenPages/LicenseInfo.txt
similarity index 100%
rename from LUFA/ManPages/LicenseInfo.txt
rename to LUFA/DoxygenPages/LicenseInfo.txt
diff --git a/LUFA/ManPages/MainPage.txt b/LUFA/DoxygenPages/MainPage.txt
similarity index 100%
rename from LUFA/ManPages/MainPage.txt
rename to LUFA/DoxygenPages/MainPage.txt
diff --git a/LUFA/ManPages/MigrationInformation.txt b/LUFA/DoxygenPages/MigrationInformation.txt
similarity index 100%
rename from LUFA/ManPages/MigrationInformation.txt
rename to LUFA/DoxygenPages/MigrationInformation.txt
diff --git a/LUFA/ManPages/ProgrammingApps.txt b/LUFA/DoxygenPages/ProgrammingApps.txt
similarity index 100%
rename from LUFA/ManPages/ProgrammingApps.txt
rename to LUFA/DoxygenPages/ProgrammingApps.txt
diff --git a/LUFA/ManPages/SoftwareBootloaderJump.txt b/LUFA/DoxygenPages/SoftwareBootloaderJump.txt
similarity index 100%
rename from LUFA/ManPages/SoftwareBootloaderJump.txt
rename to LUFA/DoxygenPages/SoftwareBootloaderJump.txt
diff --git a/LUFA/ManPages/VIDAndPIDValues.txt b/LUFA/DoxygenPages/VIDAndPIDValues.txt
similarity index 100%
rename from LUFA/ManPages/VIDAndPIDValues.txt
rename to LUFA/DoxygenPages/VIDAndPIDValues.txt
diff --git a/LUFA/ManPages/WhyUseLUFA.txt b/LUFA/DoxygenPages/WhyUseLUFA.txt
similarity index 100%
rename from LUFA/ManPages/WhyUseLUFA.txt
rename to LUFA/DoxygenPages/WhyUseLUFA.txt
diff --git a/LUFA/ManPages/WritingBoardDrivers.txt b/LUFA/DoxygenPages/WritingBoardDrivers.txt
similarity index 100%
rename from LUFA/ManPages/WritingBoardDrivers.txt
rename to LUFA/DoxygenPages/WritingBoardDrivers.txt
diff --git a/LUFA/ManPages/footer.htm b/LUFA/DoxygenPages/footer.htm
similarity index 100%
rename from LUFA/ManPages/footer.htm
rename to LUFA/DoxygenPages/footer.htm