Merge branch 'release/Initial_Release' into develop
Update folder layout
Merge branch 'release/Layout_update'