Changed some class structures as the one class was getting crowded.