Reorganize daemon files