Some refactorings, reduced top level class count. Removed calculating of complete size and progressbar.