refactoring project structure
urls refactored