decoupling sync logic + some .tmp restructuration (renaming)