Fix ordering
Fix file types processed