Moved interfaces locally and switched some dependencies