Code cleanup, and root level archive file support