Third commit

Refactoring
Support "q"
Insert Order Providers
Update BDD