Reordering rank 1 before rank 2
Adding layers for rank 3-5