Relocated some files, continued plans for the internal API.