moved public interface files/defs to proper places