move sources to src directory
Merge branch 'master'