Added api; fixed javadocs
Fixed added files
Cleanup, added test
Removed aggregate mode
Readded dir mode
Merge pull request #2 from p000ison/api

API