refactor salt directories structure