Implemented total infection and started working on limited infection
Refactored the classes