[REFACTORING] Update project structure