Cosmetic changes
Revert "Cosmetic changes"

This reverts commit 9e231cb0356c8b7ecd11629333ae79e09210af98.
Renamed source dir