refactor project structure
refactor project structure