Rearranged layers to reduce the number of toplevel layers and removed redundant bits