refactor project structure
refactor