Move interfaces into own package