dockerfile restructured