Continue big refactoring
Fix daemon spec file