Move interfaces in new folder