Remove console log
Fix search and update project structure