Moved the module into its own directory