some basic structure modifications
Merge branch 'dev'