Fixing location of refactored includes
Adding download / skip / timer / filesize counts for statistics collections