Restructuring classes to suit View process tracking.