Restructure folders
Fix catch-all route
Merge pull request #29 from theponti/develop

Develop