heavy refractoring of class/object names to aid understanding of application structure