major refactor, start on support for rar-files