Started replacing old classes with newer ones.

Older classes were replaced with newer ones, to ensure that the backbone
of the project runs without flaws.