move interfaces to proper packages