Moved interfaces into src (whoops)