Merge pull request #31 from kmeurer/master

Develop basic API infrastructure. Refactor to remove unnecessary code.
change file names.