Moving wave into its own package.