Extracted system and service into their own configuration files