T17 Moved interfaces into an interface package