More organizing and documenting