Move staff related stuff to its own file