Moving dice into its own plugin, some cleanup