refactor project structure
updating entities