Change the package structure
I don't understand why the package structure is first order aligned to the layers, i would prefer to organize a repository by domains, and then by layers if helpful, my be automated or as a virtual structure. For backwards compatibilty, a tool could create the layer oriented package structure, with substructures of each package. (see screenshot)