reorganizing structure and adding new reservation view