Moved interfaces in their own packages