Files added to container moved to one directory

This is to save some filesystem layers in the built image.