Move sources to separate directories
Revert "Move sources to separate directories"

This reverts commit d8910f4b098d36efa2f2326a81ae5949190a8b7b.