rearrange and change docker files