Changes in build. New directory structure for container