Add file finding logic into it's own class
Fix bug with current page overriding
Merge branch 'develop'