Move APIs to the proper place
Merge pull request #4 from portablejim/moveApis

Move APIs to the proper place