log reorganize
Reorganize files and update project configuration
Merge branch 'release/v2.0.1'