Refactoring - no functional changes.
Merge pull request #14 from edwardwe7/multiple.files

just some refactoring
Convert to gradle build. Separate annotations. Bump version number
Merge pull request #15 from devmop/feature/gradle

Convert to gradle build. Separate annotations. Bump version number