Fix filter bug
Abstract out file ordering
Bump version