spin off toolbar module into its own folder;