Changed structure of Dockerfile