restructure: fixed #79