Moved containers to own directory