typo fix
further interface support
moved file