Add better service handling and directories group and permissions