Test battle button, reorganization, deleted extra plugins