Re-organise modules and submodules
Added structure to shipment-related models
Add order/shipment details to dashboard