Issue #19: Reorganize interface structure