Mark ally buildings. Refactor unit containers