Revert "refactor salt directories structure"

This reverts commit 941daf9b2bef6030cb0555aa651c817ffacf346f.