Fixing file routing
Merge pull request #608 from lennynyktyk/dev

Fixing file routing