Added gem bullet and organize others
Added configuration for bullet
Improvement on queries