Merge branch 'development'

Merged. Structure is changed.
Fix build bug