update components from search
Refactor GEM structure