reorganizing dockerfile