Fixed up daemon and sources file structureWq