move sources to dir `src'
Merge branch 'master' into develop