Added separate interface, split into two dirs