Refactor urls
Add more files