Moved interfaces into classes that use them