diff --git a/src/Orchard.Web/Modules/ArchiveLater/Content/Admin/images/scheduled.gif b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Content/Admin/images/scheduled.gif
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Content/Admin/images/scheduled.gif
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Content/Admin/images/scheduled.gif
diff --git a/src/Orchard.Web/Modules/ArchiveLater/DataMigrations/ArchiveLaterDataMigration.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/DataMigrations/ArchiveLaterDataMigration.cs
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/DataMigrations/ArchiveLaterDataMigration.cs
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/DataMigrations/ArchiveLaterDataMigration.cs
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Drivers/ArchiveLaterPartDriver.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Drivers/ArchiveLaterPartDriver.cs
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Drivers/ArchiveLaterPartDriver.cs
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Drivers/ArchiveLaterPartDriver.cs
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Handlers/ArchiveLaterPartHandler.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Handlers/ArchiveLaterPartHandler.cs
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Handlers/ArchiveLaterPartHandler.cs
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Handlers/ArchiveLaterPartHandler.cs
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Handlers/UnpublishingTaskHandler.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Handlers/UnpublishingTaskHandler.cs
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Handlers/UnpublishingTaskHandler.cs
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Handlers/UnpublishingTaskHandler.cs
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Models/ArchiveLaterPart.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Models/ArchiveLaterPart.cs
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Models/ArchiveLaterPart.cs
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Models/ArchiveLaterPart.cs
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Module.txt b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Module.txt
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Module.txt
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Module.txt
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Orchard.ArchiveLater.csproj b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Orchard.ArchiveLater.csproj
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Properties/AssemblyInfo.cs
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Properties/AssemblyInfo.cs
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Scripts/jquery.ui.core.js b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Scripts/jquery.ui.core.js
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Scripts/jquery.ui.core.js
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Scripts/jquery.ui.core.js
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Scripts/jquery.ui.datepicker.js b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Scripts/jquery.ui.datepicker.js
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Scripts/jquery.ui.datepicker.js
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Scripts/jquery.ui.datepicker.js
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Scripts/jquery.ui.widget.js b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Scripts/jquery.ui.widget.js
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Scripts/jquery.ui.widget.js
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Scripts/jquery.ui.widget.js
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Scripts/jquery.utils.js b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Scripts/jquery.utils.js
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Scripts/jquery.utils.js
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Scripts/jquery.utils.js
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Scripts/ui.timepickr.js b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Scripts/ui.timepickr.js
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Scripts/ui.timepickr.js
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Scripts/ui.timepickr.js
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Services/ArchiveLaterService.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Services/ArchiveLaterService.cs
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Services/ArchiveLaterService.cs
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Services/ArchiveLaterService.cs
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Services/IArchiveLaterService.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Services/IArchiveLaterService.cs
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Services/IArchiveLaterService.cs
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Services/IArchiveLaterService.cs
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Styles/datetime.css b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/datetime.css
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Styles/datetime.css
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/datetime.css
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-bg_flat_0_aaaaaa_40x100.png b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-bg_flat_75_ffffff_40x100.png b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-bg_flat_75_ffffff_40x100.png
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-bg_flat_75_ffffff_40x100.png
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-bg_glass_55_fbf9ee_1x400.png b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-bg_glass_55_fbf9ee_1x400.png
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-bg_glass_55_fbf9ee_1x400.png
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-bg_glass_65_ffffff_1x400.png b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-bg_glass_65_ffffff_1x400.png
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-bg_glass_75_dadada_1x400.png b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-bg_glass_75_dadada_1x400.png
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-bg_glass_75_dadada_1x400.png
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-bg_glass_75_e6e6e6_1x400.png b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-bg_glass_75_e6e6e6_1x400.png
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-bg_glass_75_e6e6e6_1x400.png
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-bg_glass_95_fef1ec_1x400.png b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-bg_glass_95_fef1ec_1x400.png
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-bg_highlight-soft_75_cccccc_1x100.png
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-bg_highlight-soft_75_cccccc_1x100.png
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-icons_222222_256x240.png b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-icons_222222_256x240.png
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-icons_222222_256x240.png
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-icons_222222_256x240.png
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-icons_2e83ff_256x240.png b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-icons_2e83ff_256x240.png
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-icons_2e83ff_256x240.png
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-icons_454545_256x240.png b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-icons_454545_256x240.png
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-icons_454545_256x240.png
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-icons_454545_256x240.png
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-icons_888888_256x240.png b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-icons_888888_256x240.png
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-icons_888888_256x240.png
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-icons_888888_256x240.png
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-icons_cd0a0a_256x240.png b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Styles/images/ui-icons_cd0a0a_256x240.png
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/images/ui-icons_cd0a0a_256x240.png
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Styles/jquery-ui-1.7.2.custom.css b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/jquery-ui-1.7.2.custom.css
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Styles/jquery-ui-1.7.2.custom.css
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/jquery-ui-1.7.2.custom.css
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Styles/ui.datepicker.css b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/ui.datepicker.css
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Styles/ui.datepicker.css
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/ui.datepicker.css
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Styles/ui.timepickr.css b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/ui.timepickr.css
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Styles/ui.timepickr.css
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/ui.timepickr.css
diff --git a/src/Orchard.Web/Modules/ArchiveLater/ViewModels/ArchiveLaterViewModel.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/ViewModels/ArchiveLaterViewModel.cs
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/ViewModels/ArchiveLaterViewModel.cs
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/ViewModels/ArchiveLaterViewModel.cs
diff --git a/src/Orchard.Web/Modules/ArchiveLater/ViewModels/ItemReferenceContentFieldDisplayModel.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/ViewModels/ItemReferenceContentFieldDisplayModel.cs
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/ViewModels/ItemReferenceContentFieldDisplayModel.cs
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/ViewModels/ItemReferenceContentFieldDisplayModel.cs
diff --git a/src/Orchard.Web/Modules/ArchiveLater/ViewModels/ItemReferenceContentFieldEditorViewModel.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/ViewModels/ItemReferenceContentFieldEditorViewModel.cs
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/ViewModels/ItemReferenceContentFieldEditorViewModel.cs
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/ViewModels/ItemReferenceContentFieldEditorViewModel.cs
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.SummaryAdmin.ascx b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.SummaryAdmin.ascx
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.SummaryAdmin.ascx
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.SummaryAdmin.ascx
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.ascx b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.ascx
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.ascx
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.ascx
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.ascx b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.ascx
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.ascx
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.ascx
diff --git a/src/Orchard.Web/Modules/ArchiveLater/Views/Web.config b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/Web.config
similarity index 100%
rename from src/Orchard.Web/Modules/ArchiveLater/Views/Web.config
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/Web.config