Clean up the utils header wrt the diagonalization routines.
Put everything into folders.