fix main task
Merge pull request #63 from BHTechMobile/Reorganization_architecture

Reorganization architecture