Moved folder size calculation around