Reorganized src and doc