reorganized working directory
Merge branch 'dev'