Reorganize project and lots of update
:lollipop: Reorganize project and lots of update