Clean up Eloquent folder a bit

- Re-arrange namespaces
- Properly indent params in DocBlocks
- Add missing params in DocBlocks
- Add dependencies in to some function parameters (Mostly Builder classes)
- Fix some incorrect return types

Fixed some things from #2028.