Basic Structure

Update basic structure