refactoring projcet structure
refactoring project structure