diff --git a/demos/modules/CronTab/CronTab.ps1xml b/demos/crontab/CronTab/CronTab.ps1xml
similarity index 100%
rename from demos/modules/CronTab/CronTab.ps1xml
rename to demos/crontab/CronTab/CronTab.ps1xml
diff --git a/demos/crontab/CronTab/CronTab.psd1 b/demos/crontab/CronTab/CronTab.psd1
new file mode 100755
index 0000000000..15c279cbba
--- /dev/null
+++ b/demos/crontab/CronTab/CronTab.psd1
@@ -0,0 +1,61 @@
+@{
+
+# Script module or binary module file associated with this manifest.
+RootModule = 'CronTab.psm1'
+
+# Version number of this module.
+ModuleVersion = '0.1.0.0'
+
+# Supported PSEditions
+CompatiblePSEditions = @('Linux')
+
+# ID used to uniquely identify this module
+GUID = '508bb97f-de2e-482e-aae2-01caec0be8c7'
+
+# Author of this module
+Author = 'Microsoft'
+
+# Company or vendor of this module
+CompanyName = 'Unknown'
+
+# Copyright statement for this module
+Copyright = '(c) 2016 Microsoft. All rights reserved.'
+
+# Description of the functionality provided by this module
+Description = 'Sample module for managing CronTab'
+
+# Format files (.ps1xml) to be loaded when importing this module
+FormatsToProcess = 'CronTab.ps1xml'
+
+# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
+FunctionsToExport = 'New-CronJob','Remove-CronJob','Get-CronJob','Get-CronTabUser'
+
+# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
+PrivateData = @{
+
+    PSData = @{
+
+        # Tags applied to this module. These help with module discovery in online galleries.
+        # Tags = @()
+
+        # A URL to the license for this module.
+        # LicenseUri = ''
+
+        # A URL to the main website for this project.
+        # ProjectUri = ''
+
+        # A URL to an icon representing this module.
+        # IconUri = ''
+
+        # ReleaseNotes of this module
+        # ReleaseNotes = ''
+
+    } # End of PSData hashtable
+
+} # End of PrivateData hashtable
+
+# HelpInfo URI of this module
+# HelpInfoURI = ''
+
+}
+
diff --git a/demos/modules/CronTab/CronTab.psm1 b/demos/crontab/CronTab/CronTab.psm1
similarity index 100%
rename from demos/modules/CronTab/CronTab.psm1
rename to demos/crontab/CronTab/CronTab.psm1
diff --git a/demos/crontab.ps1 b/demos/crontab/crontab.ps1
similarity index 75%
rename from demos/crontab.ps1
rename to demos/crontab/crontab.ps1
index 85bd631394..9e17acaedf 100644
--- a/demos/crontab.ps1
+++ b/demos/crontab/crontab.ps1
@@ -1,10 +1,5 @@
 
-if (!($env:PSMODULEPATH -split ';' | Where-Object { $_.StartsWith($PSScriptRoot) }))
-{
-    $env:PSMODULEPATH += ";$PSScriptRoot/modules"
-}
-
-Import-Module CronTab
+Import-Module $PSScriptRoot/CronTab/CronTab.psd1
 
 # Get the existing cron jobs
 Get-CronJob
diff --git a/demos/modules/CronTab/CronTab.psd1 b/demos/modules/CronTab/CronTab.psd1
deleted file mode 100644
index 5a73eb59cf..0000000000
Binary files a/demos/modules/CronTab/CronTab.psd1 and /dev/null differ