Move Interfaces into separate directory