Move all configuration variables together

Change-Id: If94d286a12dcd69021f3499549203b5c0f3b6212