Moved defaults out to their own file

Change-Id: I6209573aa4fb940cd97975dcb9c33ec282d6a1d1