Merge pull request #6 from mcsuth/master

Moved files (out of one level deep).
new api and delete function changes
Getting updated files from Nico.