Major solution reorganisation to provide better control in the future