refactor : split definitions
fix a bit
Merge pull request #9 from otiai10/develop

refactor : split definitions