Refactoring folders for daemon