Change code structure
Change code structure