fix syntax error
refactor the code
fix async problem
fixed confilct
fixes most files
Merge pull request #83 from kingstenbanh/master

refactor application structure
Merge pull request #84 from Kdr18702/master

Update package json
Update package.json