refactoring urls, and folder structure