Move inner interface to outer interface also some rename