hotfolder refactorings