Merge code into guestbook folder