Circle Work aswell as some more restructuring