Reorganized files.  Started to reimplement API engine