WIP
- removed more SHIRO
- reorganized interfaces.