Moving bundle definitions so that plugins will load