Completely reworking the layer system