Update gem structure
Use custom layout