Merge pull request #40 from lazy-night/dev/api

Arrange files