Reorganize slots to a more logical triangular layout. Closes GH-2