Adding common classes and renaming some stuff.