Code service & structure

Code service & structure