Generic lists in all classes

Replaced arraylist variables with generic lists in all classes