Refactoring folders to include reporting daemon
Refactoring folders for daemon