Refactor some classes to improve score
Fix spec folder in OrderBundle