Updated file paths.
Performance revisions.