Moving class defs back to interface and incude paths corrected