[REF] Change structure of dockerfiles and small fixes