Fix app structure
Fix js
Merge branch 'release/0.0.2'