put typydefs into classes, made them dependent on each other. renamed variables/functions