Replaced static course variables with structs