Added initial structure for first-time setup