reorganisation + add battleFieldCleaner