Updated Config Structure

See Config-File for new Format