Revert "Moving of source to upper level"

This reverts commit 1fb90ee0684ce2d22bb08fc3e817e65cfdef74ed.