- Added correct dependencies.
- Changed order.