Moved interfaces to different files.