Move the interface again to follow SPL structure.