Trying to organise portal by domain and not layer