Refactor a multitude of classes