Reorganization
Updating doc