organizes sources in sources directory
Merge branch 'refactors-directory-structure'