Feature/split cla and teams