Fixed bytes to size, added directory preservation