Change entity.rb to entity_search.rb
Add entity search classes