Organize Infestation.cs