log reorganize
Reorganize files and update project configuration