Move interfaces to new file and clean up project.