Change naming structure.
Merge pull request #7 from c10b10/new-implementation

Change naming structure.