Restructuring for packaging
Restructuring checked to be working
So far so good: pre-Transport storage