Relocated additional files to up level
Merge branch 'master' into dev